@@ -536,10 +536,6 @@ struct mvneta_port {
struct mvneta_bm_pool *pool_short;
int bm_win_id;
- bool eee_enabled;
- bool eee_active;
- bool tx_lpi_enabled;
-
u64 ethtool_stats[ARRAY_SIZE(mvneta_statistics)];
u32 indir[MVNETA_RSS_LU_TABLE_SIZE];
@@ -4170,7 +4166,6 @@ static void mvneta_mac_link_down(struct phylink_config *config,
mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val);
}
- pp->eee_active = false;
mvneta_set_eee(pp, false);
}
@@ -4222,10 +4217,8 @@ static void mvneta_mac_link_up(struct phylink_config *config,
mvneta_port_up(pp);
- if (phy && pp->eee_enabled) {
- pp->eee_active = phy_init_eee(phy, false) >= 0;
- mvneta_set_eee(pp, pp->eee_active && pp->tx_lpi_enabled);
- }
+ if (phy)
+ mvneta_set_eee(pp, eee_active);
}
static const struct phylink_mac_ops mvneta_phylink_ops = {
@@ -5029,9 +5022,6 @@ static int mvneta_ethtool_get_eee(struct net_device *dev,
lpi_ctl0 = mvreg_read(pp, MVNETA_LPI_CTRL_0);
- eee->eee_enabled = pp->eee_enabled;
- eee->eee_active = pp->eee_active;
- eee->tx_lpi_enabled = pp->tx_lpi_enabled;
eee->tx_lpi_timer = (lpi_ctl0) >> 8; // * scale;
return phylink_ethtool_get_eee(pp->phylink, eee);
@@ -5054,11 +5044,6 @@ static int mvneta_ethtool_set_eee(struct net_device *dev,
lpi_ctl0 |= eee->tx_lpi_timer << 8;
mvreg_write(pp, MVNETA_LPI_CTRL_0, lpi_ctl0);
- pp->eee_enabled = eee->eee_enabled;
- pp->tx_lpi_enabled = eee->tx_lpi_enabled;
-
- mvneta_set_eee(pp, eee->tx_lpi_enabled && eee->eee_enabled);
-
return phylink_ethtool_set_eee(pp->phylink, eee);
}
phylib already does most of the work. It will track eee_enabled, eee_active and tx_lpi_enabled and correctly set them in the ethtool_get_eee callback. Replace the call to phy_init_eee() by looking at the value of eee_active passed to the function. Signed-off-by: Andrew Lunn <andrew@lunn.ch> --- v2: Use eee_active parameter, which is race free. Remove handling of tx_lpi_enabled, leave it to phylib. --- drivers/net/ethernet/marvell/mvneta.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)