1 files changed, 57 insertions, 54 deletions

diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
index adf23d2ac488..b3679ad1c1c7 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@ -163,14 +163,13 @@ void bcmgenet_mii_setup(struct net_device *dev)
         phy_print_status(phydev);
 }
 
-void bcmgenet_mii_reset(struct net_device *dev)
+static int bcmgenet_fixed_phy_link_update(struct net_device *dev,
+                                          struct fixed_phy_status *status)
 {
-        struct bcmgenet_priv *priv = netdev_priv(dev);
+        if (dev && dev->phydev && status)
+                status->link = dev->phydev->link;
 
-        if (priv->phydev) {
-                phy_init_hw(priv->phydev);
-                phy_start_aneg(priv->phydev);
-        }
+        return 0;
 }
 
 void bcmgenet_phy_power_set(struct net_device *dev, bool enable)
@@ -215,7 +214,6 @@ static void bcmgenet_internal_phy_setup(struct net_device *dev)
         reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT);
         reg |= EXT_PWR_DN_EN_LD;
         bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);
-        bcmgenet_mii_reset(dev);
 }
 
 static void bcmgenet_moca_phy_setup(struct bcmgenet_priv *priv)
@@ -226,9 +224,13 @@ static void bcmgenet_moca_phy_setup(struct bcmgenet_priv *priv)
         reg = bcmgenet_sys_readl(priv, SYS_PORT_CTRL);
         reg |= LED_ACT_SOURCE_MAC;
         bcmgenet_sys_writel(priv, reg, SYS_PORT_CTRL);
+
+        if (priv->hw_params->flags & GENET_HAS_MOCA_LINK_DET)
+                fixed_phy_set_link_update(priv->phydev,
+                                          bcmgenet_fixed_phy_link_update);
 }
 
-int bcmgenet_mii_config(struct net_device *dev, bool init)
+int bcmgenet_mii_config(struct net_device *dev)
 {
         struct bcmgenet_priv *priv = netdev_priv(dev);
         struct phy_device *phydev = priv->phydev;
@@ -238,10 +240,10 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)
         u32 port_ctrl;
         u32 reg;
 
-        priv->ext_phy = !phy_is_internal(priv->phydev) &&
+        priv->ext_phy = !priv->internal_phy &&
                         (priv->phy_interface != PHY_INTERFACE_MODE_MOCA);
 
-        if (phy_is_internal(priv->phydev))
+        if (priv->internal_phy)
                 priv->phy_interface = PHY_INTERFACE_MODE_NA;
 
         switch (priv->phy_interface) {
@@ -259,7 +261,7 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)
 
                 bcmgenet_sys_writel(priv, port_ctrl, SYS_PORT_CTRL);
 
-                if (phy_is_internal(priv->phydev)) {
+                if (priv->internal_phy) {
                         phy_name = "internal PHY";
                         bcmgenet_internal_phy_setup(dev);
                 } else if (priv->phy_interface == PHY_INTERFACE_MODE_MOCA) {
@@ -321,13 +323,12 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)
                 bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL);
         }
 
-        if (init)
-                dev_info(kdev, "configuring instance for %s\n", phy_name);
+        dev_info_once(kdev, "configuring instance for %s\n", phy_name);
 
         return 0;
 }
 
-static int bcmgenet_mii_probe(struct net_device *dev)
+int bcmgenet_mii_probe(struct net_device *dev)
 {
         struct bcmgenet_priv *priv = netdev_priv(dev);
         struct device_node *dn = priv->pdev->dev.of_node;
@@ -345,22 +346,6 @@ static int bcmgenet_mii_probe(struct net_device *dev)
         priv->old_pause = -1;
 
         if (dn) {
-                if (priv->phydev) {
-                        pr_info("PHY already attached\n");
-                        return 0;
-                }
-
-                /* In the case of a fixed PHY, the DT node associated
-                 * to the PHY is the Ethernet MAC DT node.
-                 */
-                if (!priv->phy_dn && of_phy_is_fixed_link(dn)) {
-                        ret = of_phy_register_fixed_link(dn);
-                        if (ret)
-                                return ret;
-
-                        priv->phy_dn = of_node_get(dn);
-                }
-
                 phydev = of_phy_connect(dev, priv->phy_dn, bcmgenet_mii_setup,
                                         phy_flags, priv->phy_interface);
                 if (!phydev) {
@@ -386,7 +371,7 @@ static int bcmgenet_mii_probe(struct net_device *dev)
          * PHY speed which is needed for bcmgenet_mii_config() to configure
          * things appropriately.
          */
-        ret = bcmgenet_mii_config(dev, true);
+        ret = bcmgenet_mii_config(dev);
         if (ret) {
                 phy_disconnect(priv->phydev);
                 return ret;
@@ -397,14 +382,11 @@ static int bcmgenet_mii_probe(struct net_device *dev)
         /* The internal PHY has its link interrupts routed to the
          * Ethernet MAC ISRs
          */
-        if (phy_is_internal(priv->phydev))
+        if (priv->internal_phy)
                 priv->mii_bus->irq[phydev->addr] = PHY_IGNORE_INTERRUPT;
         else
                 priv->mii_bus->irq[phydev->addr] = PHY_POLL;
 
-        pr_info("attached PHY at address %d [%s]\n",
-                phydev->addr, phydev->drv->name);
-
         return 0;
 }
 
@@ -490,7 +472,10 @@ static int bcmgenet_mii_of_init(struct bcmgenet_priv *priv)
 {
         struct device_node *dn = priv->pdev->dev.of_node;
         struct device *kdev = &priv->pdev->dev;
+        const char *phy_mode_str = NULL;
+        struct phy_device *phydev = NULL;
         char *compat;
+        int phy_mode;
         int ret;
 
         compat = kasprintf(GFP_KERNEL, "brcm,genet-mdio-v%d", priv->version);
@@ -513,17 +498,43 @@ static int bcmgenet_mii_of_init(struct bcmgenet_priv *priv)
         /* Fetch the PHY phandle */
         priv->phy_dn = of_parse_phandle(dn, "phy-handle", 0);
 
+        /* In the case of a fixed PHY, the DT node associated
+         * to the PHY is the Ethernet MAC DT node.
+         */
+        if (!priv->phy_dn && of_phy_is_fixed_link(dn)) {
+                ret = of_phy_register_fixed_link(dn);
+                if (ret)
+                        return ret;
+
+                priv->phy_dn = of_node_get(dn);
+        }
+
         /* Get the link mode */
-        priv->phy_interface = of_get_phy_mode(dn);
+        phy_mode = of_get_phy_mode(dn);
+        priv->phy_interface = phy_mode;
 
-        return 0;
-}
+        /* We need to specifically look up whether this PHY interface is internal
+         * or not *before* we even try to probe the PHY driver over MDIO as we
+         * may have shut down the internal PHY for power saving purposes.
+         */
+        if (phy_mode < 0) {
+                ret = of_property_read_string(dn, "phy-mode", &phy_mode_str);
+                if (ret < 0) {
+                        dev_err(kdev, "invalid PHY mode property\n");
+                        return ret;
+                }
 
-static int bcmgenet_fixed_phy_link_update(struct net_device *dev,
-                                          struct fixed_phy_status *status)
-{
-        if (dev && dev->phydev && status)
-                status->link = dev->phydev->link;
+                priv->phy_interface = PHY_INTERFACE_MODE_NA;
+                if (!strcasecmp(phy_mode_str, "internal"))
+                        priv->internal_phy = true;
+        }
+
+        /* Make sure we initialize MoCA PHYs with a link down */
+        if (phy_mode == PHY_INTERFACE_MODE_MOCA) {
+                phydev = of_phy_find_device(dn);
+                if (phydev)
+                        phydev->link = 0;
+        }
 
         return 0;
 }
@@ -580,12 +591,9 @@ static int bcmgenet_mii_pd_init(struct bcmgenet_priv *priv)
                         return -ENODEV;
                 }
 
-                if (priv->hw_params->flags & GENET_HAS_MOCA_LINK_DET) {
-                        ret = fixed_phy_set_link_update(
-                                phydev, bcmgenet_fixed_phy_link_update);
-                        if (!ret)
-                                phydev->link = 0;
-                }
+                /* Make sure we initialize MoCA PHYs with a link down */
+                phydev->link = 0;
+
         }
 
         priv->phydev = phydev;
@@ -615,10 +623,6 @@ int bcmgenet_mii_init(struct net_device *dev)
 
         ret = bcmgenet_mii_bus_init(priv);
         if (ret)
-                goto out_free;
-
-        ret = bcmgenet_mii_probe(dev);
-        if (ret)
                 goto out;
 
         return 0;
@@ -626,7 +630,6 @@ int bcmgenet_mii_init(struct net_device *dev)
 out:
         of_node_put(priv->phy_dn);
         mdiobus_unregister(priv->mii_bus);
-out_free:
         kfree(priv->mii_bus->irq);
         mdiobus_free(priv->mii_bus);
         return ret;