Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758665AbaDBLvr (ORCPT ); Wed, 2 Apr 2014 07:51:47 -0400 Received: from mail-la0-f51.google.com ([209.85.215.51]:33529 "EHLO mail-la0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758518AbaDBLvp (ORCPT ); Wed, 2 Apr 2014 07:51:45 -0400 Message-ID: <533BF9CE.3050302@cogentembedded.com> Date: Wed, 02 Apr 2014 15:51:42 +0400 From: Sergei Shtylyov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Alexander Holler , linux-kernel@vger.kernel.org CC: netdev@vger.kernel.org, Florian Fainelli , Michal Simek , stable@vger.kernel.org Subject: Re: [PATCH regression] net: phy: fix initialization (config_init) for Marvel 88E1116R PHYs References: <1396396559-6971-1-git-send-email-holler@ahsoftware.de> In-Reply-To: <1396396559-6971-1-git-send-email-holler@ahsoftware.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello. On 02-04-2014 3:55, Alexander Holler wrote: > Commit 7cd1463664c2a15721ff4ccfb61d4d970815cb3d (introduced with 3.14) > changed the initialization of the mv643xx_eth driver to use phy_init_hw() > to reset the PHY. Unfortunately the initialization for the 88E1116R PHY > was broken such, that it used mdelay() instead of really waiting for a > reset to finish. > The effect was that the ethernet on my Kirkwood 88F6281 based device didn't > come up anymore (no carrier). > Fix this by waiting for a reset to finish before proceeding further. > Signed-off-by: Alexander Holler > Cc: Michal Simek > Cc: Florian Fainelli > Cc: > --- > drivers/net/phy/marvell.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c > index bd37e45..5b84808 100644 > --- a/drivers/net/phy/marvell.c > +++ b/drivers/net/phy/marvell.c > @@ -396,7 +396,9 @@ static int m88e1116r_config_init(struct phy_device *phydev) > if (err < 0) > return err; > > - mdelay(500); > + do > + temp = phy_read(phydev, MII_BMCR); > + while (temp & BMCR_RESET); I don't understand what's the point of this BMCR reset if phy_init_hw() will have already done it before calling phy_init_hw(). > @@ -429,7 +431,9 @@ static int m88e1116r_config_init(struct phy_device *phydev) > if (err < 0) > return err; > > - mdelay(500); > + do > + temp = phy_read(phydev, MII_BMCR); > + while (temp & BMCR_RESET); Not clear why it's necessary to reset one more time... Also, tight loop without a timeout (0.5 sec, specified by IEEE 802.3) doesn't look good. The comment above phy_poll_reset() suggests that it could be used in the PHY drivers as well. Florian? WBR, Sergei -- 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/