net: bcm: asp2: convert to phylib managed EEE

Convert the Broadcom ASP2 driver to use phylib managed EEE support.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Tested-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://patch.msgid.link/E1tXk81-000r4x-TS@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.h b/drivers/net/ethernet/broadcom/asp2/bcmasp.h
index f93cb3da44b0cbe2119eccabeac5ce47c8aa14b1..8fc75bcedb70fef41fd9f30f0b006c39d4436e9f 100644 (file)
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp.h
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.h
@@ -348,8 +348,6 @@ struct bcmasp_intf {
        /* Used if per intf wol irq */
        int                             wol_irq;
        unsigned int                    wol_irq_enabled:1;
-
-       struct ethtool_keee             eee;
 };
 
 #define NUM_NET_FILTERS                                32
@@ -601,5 +599,4 @@ int bcmasp_netfilt_get_all_active(struct bcmasp_intf *intf, u32 *rule_locs,
 
 void bcmasp_netfilt_suspend(struct bcmasp_intf *intf);
 
-void bcmasp_eee_enable_set(struct bcmasp_intf *intf, bool enable);
 #endif

diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c
index 5e04cd1839c0b1fccc348c330cc9ba1bbf4b9369..a537c121d3e2716856c5a410d0cc4019a80adb47 100644 (file)
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c
@@ -348,20 +348,6 @@ static int bcmasp_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
        return err;
 }
 
-void bcmasp_eee_enable_set(struct bcmasp_intf *intf, bool enable)
-{
-       u32 reg;
-
-       reg = umac_rl(intf, UMC_EEE_CTRL);
-       if (enable)
-               reg |= EEE_EN;
-       else
-               reg &= ~EEE_EN;
-       umac_wl(intf, reg, UMC_EEE_CTRL);
-
-       intf->eee.eee_enabled = enable;
-}
-
 static int bcmasp_get_eee(struct net_device *dev, struct ethtool_keee *e)
 {
        if (!dev->phydev)
@@ -372,26 +358,9 @@ static int bcmasp_get_eee(struct net_device *dev, struct ethtool_keee *e)
 
 static int bcmasp_set_eee(struct net_device *dev, struct ethtool_keee *e)
 {
-       struct bcmasp_intf *intf = netdev_priv(dev);
-       struct ethtool_keee *p = &intf->eee;
-       int ret;
-
        if (!dev->phydev)
                return -ENODEV;
 
-       if (!p->eee_enabled) {
-               bcmasp_eee_enable_set(intf, false);
-       } else {
-               ret = phy_init_eee(dev->phydev, 0);
-               if (ret) {
-                       netif_err(intf, hw, dev,
-                                 "EEE initialization failed: %d\n", ret);
-                       return ret;
-               }
-
-               bcmasp_eee_enable_set(intf, true);
-       }
-
        return phy_ethtool_set_eee(dev->phydev, e);
 }
 

diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
index 62861a454a273c357a9a45f00761e867d087e017..45ec1a9214a28bc1ad5dd355b0a650328eafb29f 100644 (file)
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
@@ -619,7 +619,6 @@ static void bcmasp_adj_link(struct net_device *dev)
        struct phy_device *phydev = dev->phydev;
        u32 cmd_bits = 0, reg;
        int changed = 0;
-       bool active;
 
        if (intf->old_link != phydev->link) {
                changed = 1;
@@ -678,9 +677,12 @@ 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);
+               reg = umac_rl(intf, UMC_EEE_CTRL);
+               if (phydev->enable_tx_lpi)
+                       reg |= EEE_EN;
+               else
+                       reg &= ~EEE_EN;
+               umac_wl(intf, reg, UMC_EEE_CTRL);
        }
 
        reg = rgmii_rl(intf, RGMII_OOB_CNTRL);
@@ -1336,7 +1338,8 @@ static void bcmasp_suspend_to_wol(struct bcmasp_intf *intf)
                                     ASP_WAKEUP_INTR2_MASK_CLEAR);
        }
 
-       if (intf->eee.eee_enabled && intf->parent->eee_fixup)
+       if (ndev->phydev && ndev->phydev->eee_cfg.eee_enabled &&
+           intf->parent->eee_fixup)
                intf->parent->eee_fixup(intf, true);
 
        netif_dbg(intf, wol, ndev, "entered WOL mode\n");
@@ -1378,7 +1381,8 @@ static void bcmasp_resume_from_wol(struct bcmasp_intf *intf)
 {
        u32 reg;
 
-       if (intf->eee.eee_enabled && intf->parent->eee_fixup)
+       if (intf->ndev->phydev && intf->ndev->phydev->eee_cfg.eee_enabled &&
+           intf->parent->eee_fixup)
                intf->parent->eee_fixup(intf, false);
 
        reg = umac_rl(intf, UMC_MPD_CTRL);
@@ -1409,9 +1413,6 @@ int bcmasp_interface_resume(struct bcmasp_intf *intf)
 
        bcmasp_resume_from_wol(intf);
 
-       if (intf->eee.eee_enabled)
-               bcmasp_eee_enable_set(intf, true);
-
        netif_device_attach(dev);
 
        return 0;