Commit 60a331ff authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: phylink: use neg_mode in phylink_mii_c22_pcs_decode_state() 



Rather than using the state of the Autoneg bit, which is unreliable
with the new PCS neg mode support, use the passed neg_mode to decide
whether to decode the link partner advertisement data.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Tested-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Link: https://patch.msgid.link/E1tXGed-000EtF-CN@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 7e3cb4e8

drivers/net/phy/phylink.c

+8 −4
Original line number Diff line number Diff line
@@ -3877,11 +3877,15 @@ void phylink_mii_c22_pcs_decode_state(struct phylink_link_state *state, 
{

	state->link = !!(bmsr & BMSR_LSTATUS);

	state->an_complete = !!(bmsr & BMSR_ANEGCOMPLETE);

	/* If there is no link or autonegotiation is disabled, the LP advertisement

	 * data is not meaningful, so don't go any further.



	/* If the link is down, the advertisement data is undefined. */

	if (!state->link)

		return;



	/* If in-band is disabled, then the advertisement data is not

	 * meaningful.

	 */

	if (!state->link || !linkmode_test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,

					       state->advertising))

	if (neg_mode != PHYLINK_PCS_NEG_INBAND_ENABLED)

		return;



	switch (state->interface) {