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

Merge branch 'net-dsa-cleanup-eee-part-2' 

Russell King says:

====================
net: dsa: cleanup EEE (part 2)

This is part 2 of the DSA EEE cleanups, removing what has become dead
code as a result of the EEE management phylib now does.

Patch 1 removes the useless setting of tx_lpi parameters in the
ksz driver.

Patch 2 does the same for mt753x.

Patch 3 removes the DSA core code that calls the get_mac_eee() operation.
This needs to be done before removing the implementations because doing
otherwise would cause dsa_user_get_eee() to return -EOPNOTSUPP.

Patches 4..8 remove the trivial get_mac_eee() implementations from DSA
drivers.

Patch 9 finally removes the get_mac_eee() method from struct
dsa_switch_ops.
====================

Link: https://patch.msgid.link/Z3vDwwsHSxH5D6Pm@shell.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents aca14bbc 2fa8b438

drivers/net/dsa/b53/b53_common.c

+0 −7
Original line number Diff line number Diff line
@@ -2232,12 +2232,6 @@ bool b53_support_eee(struct dsa_switch *ds, int port) 
}

EXPORT_SYMBOL(b53_support_eee);



int b53_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e)

{

	return 0;

}

EXPORT_SYMBOL(b53_get_mac_eee);



int b53_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e)

{

	struct b53_device *dev = ds->priv;
@@ -2299,7 +2293,6 @@ static const struct dsa_switch_ops b53_switch_ops = { 
	.port_enable		= b53_enable_port,

	.port_disable		= b53_disable_port,

	.support_eee		= b53_support_eee,

	.get_mac_eee		= b53_get_mac_eee,

	.set_mac_eee		= b53_set_mac_eee,

	.port_bridge_join	= b53_br_join,

	.port_bridge_leave	= b53_br_leave,

drivers/net/dsa/b53/b53_priv.h

+0 −1
Original line number Diff line number Diff line
@@ -385,7 +385,6 @@ void b53_disable_port(struct dsa_switch *ds, int port); 
void b53_brcm_hdr_setup(struct dsa_switch *ds, int port);

int b53_eee_init(struct dsa_switch *ds, int port, struct phy_device *phy);

bool b53_support_eee(struct dsa_switch *ds, int port);

int b53_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e);

int b53_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e);



#endif

drivers/net/dsa/bcm_sf2.c

+0 −1
Original line number Diff line number Diff line
@@ -1233,7 +1233,6 @@ static const struct dsa_switch_ops bcm_sf2_ops = { 
	.port_enable		= bcm_sf2_port_setup,

	.port_disable		= bcm_sf2_port_disable,

	.support_eee		= b53_support_eee,

	.get_mac_eee		= b53_get_mac_eee,

	.set_mac_eee		= b53_set_mac_eee,

	.port_bridge_join	= b53_br_join,

	.port_bridge_leave	= b53_br_leave,

drivers/net/dsa/microchip/ksz_common.c

+0 −15
Original line number Diff line number Diff line
@@ -3489,20 +3489,6 @@ static bool ksz_support_eee(struct dsa_switch *ds, int port) 
	return false;

}



static int ksz_get_mac_eee(struct dsa_switch *ds, int port,

			   struct ethtool_keee *e)

{

	/* There is no documented control of Tx LPI configuration. */

	e->tx_lpi_enabled = true;



	/* There is no documented control of Tx LPI timer. According to tests

	 * Tx LPI timer seems to be set by default to minimal value.

	 */

	e->tx_lpi_timer = 0;



	return 0;

}



static int ksz_set_mac_eee(struct dsa_switch *ds, int port,

			   struct ethtool_keee *e)

{
@@ -4672,7 +4658,6 @@ static const struct dsa_switch_ops ksz_switch_ops = { 
	.cls_flower_del		= ksz_cls_flower_del,

	.port_setup_tc		= ksz_setup_tc,

	.support_eee		= ksz_support_eee,

	.get_mac_eee		= ksz_get_mac_eee,

	.set_mac_eee		= ksz_set_mac_eee,

	.port_get_default_prio	= ksz_port_get_default_prio,

	.port_set_default_prio	= ksz_port_set_default_prio,

drivers/net/dsa/mt7530.c

+0 −13
Original line number Diff line number Diff line
@@ -3085,18 +3085,6 @@ mt753x_setup(struct dsa_switch *ds) 
	return ret;

}



static int mt753x_get_mac_eee(struct dsa_switch *ds, int port,

			      struct ethtool_keee *e)

{

	struct mt7530_priv *priv = ds->priv;

	u32 eeecr = mt7530_read(priv, MT753X_PMEEECR_P(port));



	e->tx_lpi_enabled = !(eeecr & LPI_MODE_EN);

	e->tx_lpi_timer = LPI_THRESH_GET(eeecr);



	return 0;

}



static int mt753x_set_mac_eee(struct dsa_switch *ds, int port,

			      struct ethtool_keee *e)

{
@@ -3239,7 +3227,6 @@ const struct dsa_switch_ops mt7530_switch_ops = { 
	.port_mirror_del	= mt753x_port_mirror_del,

	.phylink_get_caps	= mt753x_phylink_get_caps,

	.support_eee		= dsa_supports_eee,

	.get_mac_eee		= mt753x_get_mac_eee,

	.set_mac_eee		= mt753x_set_mac_eee,

	.conduit_state_change	= mt753x_conduit_state_change,

	.port_setup_tc		= mt753x_setup_tc,