Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754692AbbK0PXv (ORCPT ); Fri, 27 Nov 2015 10:23:51 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:56213 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751484AbbK0PXs (ORCPT ); Fri, 27 Nov 2015 10:23:48 -0500 Subject: Re: [PATCH] net: fec: fix enet_out clock handling To: =?UTF-8?Q?Lothar_Wa=c3=9fmann?= , Andrew Lunn , "David S. Miller" , Fabio Estevam , Kevin Hao , Lucas Stach , Nimrod Andy , Philippe Reynes , Russell King , =?UTF-8?Q?Uwe_Kleine-K=c3=b6nig?= , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Stefan Agner References: <1448631550-943-1-git-send-email-LW@KARO-electronics.de> From: Michael Heimpold Organization: I2SE GmbH Message-ID: <565873E1.1030505@i2se.com> Date: Fri, 27 Nov 2015 16:16:49 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <1448631550-943-1-git-send-email-LW@KARO-electronics.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:fAvsZqhHzIzK64T/hyX2dF03/E7F9eNJVS/N59vxNqWuOzQjrxp Zi+B6mQ/CRyWApiTl8syTey2ptWk1fd/Is2kZ4K3j8U4ZrRihCVbXcqUUAJetdnEfaXxWTd 22HL6gO0nAJcNzfJjsTL7tAMsejY1FZLDDjXA8DNlL98Cw5N9dI5w5r25nKT7nQ/ypntB4Z age26CF1zq07Dg/XwND+w== X-UI-Out-Filterresults: notjunk:1;V01:K0:gMZ2GFSl6lM=:oP70mr+LIyq0om9HCYV16R ysqRxHH067xJZLcN8/Aln/0iyXufsL9Gh6S0/8wW+TfgQH5tdQSm8u8DbshJl6MhKtlZlBrDM lZqNjkp8J62I3P0aB4geGwv2rvMq4oT725c8nWUJZpf8+nT6cVfkWkcl0BTy4VS2LB3PTC/j/ 46pVF5zuTUCrZBjY+bjjhtSCpMisooQ5/PSrlYnBZohbjLovVxiej67YQLyQaVLNyk37niPz1 +xcszMc3YsKFAICmw35ds04disdORblU8diw41TEBQEqhYhkfxbO50AYiKuOvd7W7+G5KIsWw okpNd4OsfrgYJSejF5z3U3x4V8l9uM51W0JK755Vnm29EIRpAxYEUpuYg2M+pWozs6j7RJEBP c2ed2KmY46sYXxgetrDFzkkRKWSQsOi9Myk2bDpWHeRUuZI7UoIM1hWmxZ5tcYWvybghsoe3X F3nvpbvRNKLrXPYY0P8JhaWPj3j1KLQKI4iA9SpizlzuVxRgtuarFpmRuEULl1UuL7WoTU92f MEp0Ne3pRMaEiZpXhzc/8Z1Iy1gfZRyd3sCjSMlIpsaaa2Vi1A/sfVuR2B/WEZZtM3ohoPaja Gvw534b9C85XRdDvQOqrY0TBlSK262ulMNNvh+hS5xKcsiTCt9njlfVTJhcAXtw9wRXs/ZGLQ xl7ae5o6f7w7DPmWFf7vpRcVHZ2Dp0Gz1BiPvYK+Yfx99w9xMQCVL9IRRq05c7n38/Xgqf8Bj GBC/ybGDi2k285W6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5281 Lines: 153 Hi, Am 27.11.2015 um 14:39 schrieb Lothar Waßmann: > When ENET_OUT is being used as reference clock for an external PHY, > the clock must not be disabled while the PHY is active. Otherwise the > PHY may lose its internal state and require a reset to become > functional again. > > A symptom for this bug is a network interface that constantly toggles > between UP and DOWN state: > fec 800f0000.ethernet eth0: Link is Up - 100Mbps/Full - flow control rx/tx > fec 800f0000.ethernet eth0: Link is Down > fec 800f0000.ethernet eth0: Link is Up - 100Mbps/Full - flow control rx/tx > fec 800f0000.ethernet eth0: Link is Down > [...] I would add a sentence about the solution, e.g. moving ENET_OUT handling to driver probe etc. > Signed-off-by: Lothar Waßmann > --- > drivers/net/ethernet/freescale/fec_main.c | 34 +++++++++++++------------------ > 1 file changed, 14 insertions(+), 20 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c > index d2328fc..d9df4c5 100644 > --- a/drivers/net/ethernet/freescale/fec_main.c > +++ b/drivers/net/ethernet/freescale/fec_main.c > @@ -1857,11 +1857,6 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable) > ret = clk_prepare_enable(fep->clk_ahb); > if (ret) > return ret; > - if (fep->clk_enet_out) { > - ret = clk_prepare_enable(fep->clk_enet_out); > - if (ret) > - goto failed_clk_enet_out; > - } > if (fep->clk_ptp) { > mutex_lock(&fep->ptp_clk_mutex); > ret = clk_prepare_enable(fep->clk_ptp); > @@ -1873,35 +1868,26 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable) > } > mutex_unlock(&fep->ptp_clk_mutex); > } > - if (fep->clk_ref) { > - ret = clk_prepare_enable(fep->clk_ref); > - if (ret) > - goto failed_clk_ref; > - } > + ret = clk_prepare_enable(fep->clk_ref); > + if (ret) > + goto failed_clk_ref; This change seems unrelated to the problem. At least, I can leave this part out and the toggle still disappear after apply the remaining parts. However, I've only my Duckbill (iMX28) around to test with. > } else { > clk_disable_unprepare(fep->clk_ahb); > - if (fep->clk_enet_out) > - clk_disable_unprepare(fep->clk_enet_out); > if (fep->clk_ptp) { > mutex_lock(&fep->ptp_clk_mutex); > clk_disable_unprepare(fep->clk_ptp); > fep->ptp_clk_on = false; > mutex_unlock(&fep->ptp_clk_mutex); > } > - if (fep->clk_ref) > - clk_disable_unprepare(fep->clk_ref); > + clk_disable_unprepare(fep->clk_ref); Same as above, might be unrelated. > } > > return 0; > > failed_clk_ref: > - if (fep->clk_ref) > - clk_disable_unprepare(fep->clk_ref); > + clk_disable_unprepare(fep->clk_ref); dito > failed_clk_ptp: > - if (fep->clk_enet_out) > - clk_disable_unprepare(fep->clk_enet_out); > -failed_clk_enet_out: > - clk_disable_unprepare(fep->clk_ahb); > + clk_disable_unprepare(fep->clk_ahb); > > return ret; > } > @@ -3425,6 +3411,10 @@ fec_probe(struct platform_device *pdev) > if (ret) > goto failed_clk; > > + ret = clk_prepare_enable(fep->clk_enet_out); > + if (ret) > + goto failed_clk_enet_out; > + As enet_out is optional, shouldn't this block be guarded by if (fep->clk_enet_out)... ? > ret = clk_prepare_enable(fep->clk_ipg); > if (ret) > goto failed_clk_ipg; > @@ -3509,6 +3499,8 @@ failed_init: > if (fep->reg_phy) > regulator_disable(fep->reg_phy); > failed_regulator: > + clk_disable_unprepare(fep->clk_enet_out); here too? > +failed_clk_enet_out: > clk_disable_unprepare(fep->clk_ipg); > failed_clk_ipg: > fec_enet_clk_enable(ndev, false); > @@ -3531,6 +3523,8 @@ fec_drv_remove(struct platform_device *pdev) > fec_ptp_stop(pdev); > unregister_netdev(ndev); > fec_enet_mii_remove(fep); > + fec_enet_clk_enable(ndev, false); > + clk_disable_unprepare(fep->clk_enet_out); and here too? > if (fep->reg_phy) > regulator_disable(fep->reg_phy); > of_node_put(fep->phy_node); Mit freundlichen Grüßen / Kind regards Michael Heimpold -- Software Engineer I2SE GmbH Tel: +49 (0) 341 355667-00 Friedrich-Ebert-Str. 61 Fax: +49 (0) 341 355667-02 04109 Leipzig Germany Web: http://www.i2se.com/ Mail: info@i2se.com VAT No.: DE 811528334 Amtsgericht Leipzig HRB 23784 Geschäftsführer/CEO: Carsten Ziermann *** Diese E-Mail ist allein für den bezeichneten Adressaten bestimmt. Sie kann rechtlich vertrauliche Informationen enthalten. Wenn Sie diese E-Mail irrtümlich erhalten haben, informieren Sie bitte unverzüglich den Absender per E-Mail und löschen Sie diese E-Mail von Ihrem Computer, ohne Kopien anzufertigen. Vielen Dank. *** *** This email is for the exclusive use of the addressee. It may contain legally privileged information. If you have received this message in error, please notify the sender by email immediately and delete the message from your computer without making any copies. Thank you. *** -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/