Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cf6c57e authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

net: phy: fix write to mii-ctrl1000 register 



When userspace writes to the MII_ADVERTISE register, we update phylib's
advertising mask and trigger a renegotiation.  However, writing to the
MII_CTRL1000 register, which contains the gigabit advertisement, does
neither.  This can lead to phylib's copy of the advertisement becoming
de-synced with the values in the PHY register set, which can result in
incorrect negotiation resolution.

Fixes: 5502b218 ("net: phy: use phy_resolve_aneg_linkmode in genphy_read_status")
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d819d25

drivers/net/phy/phy.c

+5 −0
Original line number Diff line number Diff line
@@ -457,6 +457,11 @@ int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd) 
							   val);

				change_autoneg = true;

				break;

			case MII_CTRL1000:

				mii_ctrl1000_mod_linkmode_adv_t(phydev->advertising,

							        val);

				change_autoneg = true;

				break;

			default:

				/* do nothing */

				break;

include/linux/mii.h

+9 −0
Original line number Diff line number Diff line
@@ -455,6 +455,15 @@ static inline void mii_lpa_mod_linkmode_lpa_t(unsigned long *lp_advertising, 
			 lp_advertising, lpa & LPA_LPACK);

}



static inline void mii_ctrl1000_mod_linkmode_adv_t(unsigned long *advertising,

						   u32 ctrl1000)

{

	linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, advertising,

			 ctrl1000 & ADVERTISE_1000HALF);

	linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, advertising,

			 ctrl1000 & ADVERTISE_1000FULL);

}



/**

 * linkmode_adv_to_lcl_adv_t

 * @advertising:pointer to linkmode advertising