Commit d46b7e4f authored by Russell King's avatar Russell King Committed by Jakub Kicinski
Browse files

net: phylink: rename mac_link_state() op to mac_pcs_get_state() 



Rename the mac_link_state() method to mac_pcs_get_state() to make it
clear that it should be returning the MACs PCS current state, which
is used for inband negotiation rather than just reading back what the
MAC has been configured for. Update the documentation to explicitly
mention that this is for inband.

We drop the return value as well; most of phylink doesn't check the
return value and it is not clear what it should do on error - instead
arrange for state->link to be false.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
parent ab818362

drivers/net/ethernet/cadence/macb_main.c

+4 −4
Original line number Diff line number Diff line
@@ -505,10 +505,10 @@ static void macb_validate(struct phylink_config *config, 
		   __ETHTOOL_LINK_MODE_MASK_NBITS);

}



static int macb_mac_link_state(struct phylink_config *config,

static void macb_mac_pcs_get_state(struct phylink_config *config,

				   struct phylink_link_state *state)

{

	return -EOPNOTSUPP;

	state->link = 0;

}



static void macb_mac_an_restart(struct phylink_config *config)
@@ -604,7 +604,7 @@ static void macb_mac_link_up(struct phylink_config *config, unsigned int mode, 


static const struct phylink_mac_ops macb_phylink_ops = {

	.validate = macb_validate,

	.mac_link_state = macb_mac_link_state,

	.mac_pcs_get_state = macb_mac_pcs_get_state,

	.mac_an_restart = macb_mac_an_restart,

	.mac_config = macb_mac_config,

	.mac_link_down = macb_mac_link_down,

drivers/net/ethernet/marvell/mvneta.c

+3 −5
Original line number Diff line number Diff line
@@ -3694,7 +3694,7 @@ static void mvneta_validate(struct phylink_config *config, 
	phylink_helper_basex_speed(state);

}



static int mvneta_mac_link_state(struct phylink_config *config,

static void mvneta_mac_pcs_get_state(struct phylink_config *config,

				     struct phylink_link_state *state)

{

	struct net_device *ndev = to_net_dev(config->dev);
@@ -3721,8 +3721,6 @@ static int mvneta_mac_link_state(struct phylink_config *config, 
		state->pause |= MLO_PAUSE_RX;

	if (gmac_stat & MVNETA_GMAC_TX_FLOW_CTRL_ENABLE)

		state->pause |= MLO_PAUSE_TX;



	return 1;

}



static void mvneta_mac_an_restart(struct phylink_config *config)
@@ -3915,7 +3913,7 @@ static void mvneta_mac_link_up(struct phylink_config *config, unsigned int mode, 


static const struct phylink_mac_ops mvneta_phylink_ops = {

	.validate = mvneta_validate,

	.mac_link_state = mvneta_mac_link_state,

	.mac_pcs_get_state = mvneta_mac_pcs_get_state,

	.mac_an_restart = mvneta_mac_an_restart,

	.mac_config = mvneta_mac_config,

	.mac_link_down = mvneta_mac_link_down,

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

+10 −11
Original line number Diff line number Diff line
@@ -4823,7 +4823,7 @@ empty_set: 
	bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);

}



static void mvpp22_xlg_link_state(struct mvpp2_port *port,

static void mvpp22_xlg_pcs_get_state(struct mvpp2_port *port,

				     struct phylink_link_state *state)

{

	u32 val;
@@ -4843,7 +4843,7 @@ static void mvpp22_xlg_link_state(struct mvpp2_port *port, 
		state->pause |= MLO_PAUSE_RX;

}



static void mvpp2_gmac_link_state(struct mvpp2_port *port,

static void mvpp2_gmac_pcs_get_state(struct mvpp2_port *port,

				     struct phylink_link_state *state)

{

	u32 val;
@@ -4877,7 +4877,7 @@ static void mvpp2_gmac_link_state(struct mvpp2_port *port, 
		state->pause |= MLO_PAUSE_TX;

}



static int mvpp2_phylink_mac_link_state(struct phylink_config *config,

static void mvpp2_phylink_mac_pcs_get_state(struct phylink_config *config,

					    struct phylink_link_state *state)

{

	struct mvpp2_port *port = container_of(config, struct mvpp2_port,
@@ -4888,13 +4888,12 @@ static int mvpp2_phylink_mac_link_state(struct phylink_config *config, 
		mode &= MVPP22_XLG_CTRL3_MACMODESELECT_MASK;



		if (mode == MVPP22_XLG_CTRL3_MACMODESELECT_10G) {

			mvpp22_xlg_link_state(port, state);

			return 1;

			mvpp22_xlg_pcs_get_state(port, state);

			return;

		}

	}



	mvpp2_gmac_link_state(port, state);

	return 1;

	mvpp2_gmac_pcs_get_state(port, state);

}



static void mvpp2_mac_an_restart(struct phylink_config *config)
@@ -5186,7 +5185,7 @@ static void mvpp2_mac_link_down(struct phylink_config *config, 


static const struct phylink_mac_ops mvpp2_phylink_ops = {

	.validate = mvpp2_phylink_validate,

	.mac_link_state = mvpp2_phylink_mac_link_state,

	.mac_pcs_get_state = mvpp2_phylink_mac_pcs_get_state,

	.mac_an_restart = mvpp2_mac_an_restart,

	.mac_config = mvpp2_mac_config,

	.mac_link_up = mvpp2_mac_link_up,

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+3 −5
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ init_err: 
		mac->id, phy_modes(state->interface), err);

}



static int mtk_mac_link_state(struct phylink_config *config,

static void mtk_mac_pcs_get_state(struct phylink_config *config,

				  struct phylink_link_state *state)

{

	struct mtk_mac *mac = container_of(config, struct mtk_mac,
@@ -391,8 +391,6 @@ static int mtk_mac_link_state(struct phylink_config *config, 
		state->pause |= MLO_PAUSE_RX;

	if (pmsr & MAC_MSR_TX_FC)

		state->pause |= MLO_PAUSE_TX;



	return 1;

}



static void mtk_mac_an_restart(struct phylink_config *config)
@@ -514,7 +512,7 @@ static void mtk_validate(struct phylink_config *config, 


static const struct phylink_mac_ops mtk_phylink_ops = {

	.validate = mtk_validate,

	.mac_link_state = mtk_mac_link_state,

	.mac_pcs_get_state = mtk_mac_pcs_get_state,

	.mac_an_restart = mtk_mac_an_restart,

	.mac_config = mtk_mac_config,

	.mac_link_down = mtk_mac_link_down,

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+4 −4
Original line number Diff line number Diff line
@@ -868,10 +868,10 @@ static void stmmac_validate(struct phylink_config *config, 
		      __ETHTOOL_LINK_MODE_MASK_NBITS);

}



static int stmmac_mac_link_state(struct phylink_config *config,

static void stmmac_mac_pcs_get_state(struct phylink_config *config,

				     struct phylink_link_state *state)

{

	return -EOPNOTSUPP;

	state->link = 0;

}



static void stmmac_mac_config(struct phylink_config *config, unsigned int mode,
@@ -965,7 +965,7 @@ static void stmmac_mac_link_up(struct phylink_config *config, 


static const struct phylink_mac_ops stmmac_phylink_mac_ops = {

	.validate = stmmac_validate,

	.mac_link_state = stmmac_mac_link_state,

	.mac_pcs_get_state = stmmac_mac_pcs_get_state,

	.mac_config = stmmac_mac_config,

	.mac_an_restart = stmmac_mac_an_restart,

	.mac_link_down = stmmac_mac_link_down,

CRA Git | Maintained and supported by SUSTech CRA and CCSE