2014-04-01 16:55 GMT-07:00 Alexander Holler <holler@xxxxxxxxxxxxx>: > Commit 7cd1463664c2a15721ff4ccfb61d4d970815cb3d (introduced with 3.14) Please specify the commit message in parenthesis. > 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 <holler@xxxxxxxxxxxxx> > > Cc: Michal Simek <michal.simek@xxxxxxxxxx> > Cc: Florian Fainelli <f.fainelli@xxxxxxxxx> > Cc: <stable@xxxxxxxxxxxxxxx> > --- > 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); Please use genphy_soft_reset() which ensures that the bit is cleared, and will also wait for an appropriate amount of time before returning. I had a bunch of local patches waiting for net-next which clean up the Marvell PHY driver to use genphy_soft_reset() consistently instead of open-coding BMCR_RESET without waiting for the bit to get cleared. > > err = phy_write(phydev, MII_MARVELL_PHY_PAGE, 0); > if (err < 0) > @@ -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); Ditto. > > return 0; > } > -- > 1.8.3.1 > -- Florian -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html