From: Russell King (Oracle) Date: Wed, 6 Mar 2024 10:51:36 +0000 (+0000) Subject: net: phy: marvell: add comment about m88e1111_config_init_1000basex() X-Git-Tag: v6.9-rc1~159^2~64 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fc80c9d8c0a5f1f64ac09137e1b1597f9708520;p=thirdparty%2Flinux.git net: phy: marvell: add comment about m88e1111_config_init_1000basex() The comment in m88e1111_config_init_1000basex() is wrong - it claims that Autoneg will be enabled, but this doesn't actually happen. Signed-off-by: Russell King (Oracle) Reviewed-by: Andrew Lunn Link: https://lore.kernel.org/r/E1rhos4-003yuQ-5p@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 1faa22f583666..42ed013385bfb 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -919,7 +919,10 @@ static int m88e1111_config_init_1000basex(struct phy_device *phydev) if (extsr < 0) return extsr; - /* If using copper mode, ensure 1000BaseX auto-negotiation is enabled */ + /* If using copper mode, ensure 1000BaseX auto-negotiation is enabled. + * FIXME: this does not actually enable 1000BaseX auto-negotiation if + * it was previously disabled in the Fiber BMCR! + */ mode = extsr & MII_M1111_HWCFG_MODE_MASK; if (mode == MII_M1111_HWCFG_MODE_COPPER_1000X_NOAN) { err = phy_modify(phydev, MII_M1111_PHY_EXT_SR,