Commit e80ed977 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-phylink-fix-pcs-without-autoneg' 

Russell King says:

====================
net: phylink: fix PCS without autoneg

Eric Woudstra reported that a PCS attached using 2500base-X does not
see link when phylink is using in-band mode, but autoneg is disabled,
despite there being a valid 2500base-X signal being received. We have
these settings:

	act_link_an_mode = MLO_AN_INBAND
	pcs_neg_mode = PHYLINK_PCS_NEG_INBAND_DISABLED

Eric diagnosed it to phylink_decode_c37_word() setting state->link
false because the full-duplex bit isn't set in the non-existent link
partner advertisement word (which doesn't exist because in-band
autoneg is disabled!)

The test in phylink_mii_c22_pcs_decode_state() is supposed to catch
this state, but since we converted PCS to use neg_mode, testing the
Autoneg in the local advertisement is no longer sufficient - we need
to be looking at the neg_mode, which currently isn't provided.

We need to provide this via the .pcs_get_state() method, and this
will require modifying all PCS implementations to add the extra
argument to this method.

Patch 1 uses the PCS neg_mode in phylink_mac_pcs_get_state() to correct
the now obsolute usage of the Autoneg bit in the advertisement.

Patch 2 passes neg_mode into the .pcs_get_state() method, and updates
all users.

Patch 3 adds neg_mode as an argument to the various clause 22 state
decoder functions in phylink, modifying drivers to pass the neg_mode
through.

Patch 4 makes use of phylink_mii_c22_pcs_decode_state() rather than
using the Autoneg bit in the advertising field.

Patch 5 may be required for Eric's case - it ensures that we report
the correct state for interface types that we support only one set
of modes for when autoneg is disabled.
====================

Link: https://patch.msgid.link/Z4TbR93B-X8A8iHe@shell.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9eb8069d e432ffc1

drivers/net/dsa/b53/b53_serdes.c

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static void b53_serdes_an_restart(struct phylink_pcs *pcs) 
			 SERDES_MII_BLK, reg);

}



static void b53_serdes_get_state(struct phylink_pcs *pcs,

static void b53_serdes_get_state(struct phylink_pcs *pcs, unsigned int neg_mode,

				 struct phylink_link_state *state)

{

	struct b53_device *dev = pcs_to_b53_pcs(pcs)->dev;

drivers/net/dsa/mt7530.c

+1 −1
Original line number Diff line number Diff line
@@ -2994,7 +2994,7 @@ static int mt753x_pcs_validate(struct phylink_pcs *pcs, 
	return 0;

}



static void mt7530_pcs_get_state(struct phylink_pcs *pcs,

static void mt7530_pcs_get_state(struct phylink_pcs *pcs, unsigned int neg_mode,

				 struct phylink_link_state *state)

{

	struct mt7530_priv *priv = pcs_to_mt753x_pcs(pcs)->priv;

drivers/net/dsa/mv88e6xxx/pcs-6185.c

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ static irqreturn_t mv88e6185_pcs_handle_irq(int irq, void *dev_id) 
}



static void mv88e6185_pcs_get_state(struct phylink_pcs *pcs,

				    unsigned int neg_mode,

				    struct phylink_link_state *state)

{

	struct mv88e6185_pcs *mpcs = pcs_to_mv88e6185_pcs(pcs);

drivers/net/dsa/mv88e6xxx/pcs-6352.c

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ static void marvell_c22_pcs_disable(struct phylink_pcs *pcs) 
}



static void marvell_c22_pcs_get_state(struct phylink_pcs *pcs,

				      unsigned int neg_mode,

				      struct phylink_link_state *state)

{

	struct marvell_c22_pcs *mpcs = pcs_to_marvell_c22_pcs(pcs);

drivers/net/dsa/mv88e6xxx/pcs-639x.c

+4 −1
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ static int mv88e639x_sgmii_pcs_post_config(struct phylink_pcs *pcs, 
}



static void mv88e639x_sgmii_pcs_get_state(struct phylink_pcs *pcs,

					  unsigned int neg_mode,

					  struct phylink_link_state *state)

{

	struct mv88e639x_pcs *mpcs = sgmii_pcs_to_mv88e639x_pcs(pcs);
@@ -395,6 +396,7 @@ static void mv88e639x_xg_pcs_disable(struct mv88e639x_pcs *mpcs) 
}



static void mv88e639x_xg_pcs_get_state(struct phylink_pcs *pcs,

				       unsigned int neg_mode,

				       struct phylink_link_state *state)

{

	struct mv88e639x_pcs *mpcs = xg_pcs_to_mv88e639x_pcs(pcs);
@@ -889,6 +891,7 @@ static int mv88e6393x_xg_pcs_post_config(struct phylink_pcs *pcs, 
}



static void mv88e6393x_xg_pcs_get_state(struct phylink_pcs *pcs,

					unsigned int neg_mode,

					struct phylink_link_state *state)

{

	struct mv88e639x_pcs *mpcs = xg_pcs_to_mv88e639x_pcs(pcs);
@@ -896,7 +899,7 @@ static void mv88e6393x_xg_pcs_get_state(struct phylink_pcs *pcs, 
	int err;



	if (state->interface != PHY_INTERFACE_MODE_USXGMII)

		return mv88e639x_xg_pcs_get_state(pcs, state);

		return mv88e639x_xg_pcs_get_state(pcs, neg_mode, state);



	state->link = false;