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

net: bcm: asp2: fix LPI timer handling 



Fix the LPI timer handling in Broadcom ASP2 driver after the phylib
managed EEE patches were merged.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Tested-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Link: https://patch.msgid.link/E1tXk7r-000r4l-Li@rmk-PC.armlinux.org.uk


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

drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c

+0 −2
Original line number Diff line number Diff line
@@ -371,7 +371,6 @@ static int bcmasp_get_eee(struct net_device *dev, struct ethtool_keee *e) 
		return -ENODEV;



	e->tx_lpi_enabled = p->tx_lpi_enabled;

	e->tx_lpi_timer = umac_rl(intf, UMC_EEE_LPI_TIMER);



	return phy_ethtool_get_eee(dev->phydev, e);

}
@@ -395,7 +394,6 @@ static int bcmasp_set_eee(struct net_device *dev, struct ethtool_keee *e) 
			return ret;

		}



		umac_wl(intf, e->tx_lpi_timer, UMC_EEE_LPI_TIMER);

		intf->eee.tx_lpi_enabled = e->tx_lpi_enabled;

		bcmasp_eee_enable_set(intf, true);

	}

drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c

+5 −0
Original line number Diff line number Diff line
@@ -677,6 +677,8 @@ static void bcmasp_adj_link(struct net_device *dev) 
		}

		umac_wl(intf, reg, UMC_CMD);



		umac_wl(intf, phydev->eee_cfg.tx_lpi_timer, UMC_EEE_LPI_TIMER);



		active = phy_init_eee(phydev, 0) >= 0;

		bcmasp_eee_enable_set(intf, active);

	}
@@ -1055,6 +1057,9 @@ static int bcmasp_netif_init(struct net_device *dev, bool phy_connect) 


		/* Indicate that the MAC is responsible for PHY PM */

		phydev->mac_managed_pm = true;



		/* Set phylib's copy of the LPI timer */

		phydev->eee_cfg.tx_lpi_timer = umac_rl(intf, UMC_EEE_LPI_TIMER);

	}



	umac_reset(intf);