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

net: phylink: pass neg_mode into .pcs_get_state() method 



Pass the current neg_mode into the .pcs_get_state() method. Update all
users of phylink PCS.

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/E1tXGeT-000Et3-4L@rmk-PC.armlinux.org.uk


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

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;