Message ID | E1rhos4-003yuQ-5p@rmk-PC.armlinux.org.uk (mailing list archive) |
---|---|
State | Accepted |
Commit | 8fc80c9d8c0a5f1f64ac09137e1b1597f9708520 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] net: phy: marvell: add comment about m88e1111_config_init_1000basex() | expand |
On Wed, Mar 06, 2024 at 10:51:36AM +0000, Russell King (Oracle) wrote: > 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) <rmk+kernel@armlinux.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 06 Mar 2024 10:51:36 +0000 you wrote: > 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) <rmk+kernel@armlinux.org.uk> > --- > drivers/net/phy/marvell.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Here is the summary with links: - [net-next] net: phy: marvell: add comment about m88e1111_config_init_1000basex() https://git.kernel.org/netdev/net-next/c/8fc80c9d8c0a You are awesome, thank you!
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 1faa22f58366..42ed013385bf 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,
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) <rmk+kernel@armlinux.org.uk> --- drivers/net/phy/marvell.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)