Merge branch 'dsa-port-config'

Andrew Lunn says:

====================
DSA port configuration and status

This patchset allows various switch port settings to be configured and
port status to be sampled. Some of these patches have been posted
before.

The first three patches provide infrastructure for configuring a
switch ports link speed and duplex from a fixed_link phy.

Patch four then uses this infrastructure to allow the CPU and DSA
ports of a switch to be configured using a fixed-link property in the
device tree.

Patches five and six allow a phy-mode property to be specified in the
device tree, and allow this to be used for configuring RGMII delays.

Patches seven through nine allow link status, for example that of an
SFP module, to be read from a gpio.

Changes since v1:

Rewrite 9/9 so that it hopefully does not regression on
868a4215be9a6d80 ("net: phy: fixed_phy: handle link-down case")
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

17 files changed, 255 insertions, 39 deletions

diff --git a/Documentation/devicetree/bindings/net/fixed-link.txt b/Documentation/devicetree/bindings/net/fixed-link.txt
index 82bf7e0f47b6..ec5d889fe3d8 100644
--- a/Documentation/devicetree/bindings/net/fixed-link.txt
+++ b/Documentation/devicetree/bindings/net/fixed-link.txt
@@ -17,6 +17,8 @@ properties:
   enabled.
 * 'asym-pause' (boolean, optional), to indicate that asym_pause should
   be enabled.
+* 'link-gpios' ('gpio-list', optional), to indicate if a gpio can be read
+  to determine if the link is up.
 
 Old, deprecated 'fixed-link' binding:
 
@@ -30,7 +32,7 @@ Old, deprecated 'fixed-link' binding:
   - e: asymmetric pause configuration: 0 for no asymmetric pause, 1 for
     asymmetric pause
 
-Example:
+Examples:
 
 ethernet@0 {
         ...
@@ -40,3 +42,13 @@ ethernet@0 {
         };
         ...
 };
+
+ethernet@1 {
+        ...
+        fixed-link {
+              speed = <1000>;
+              pause;
+              link-gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+        };
+        ...
+};
diff --git a/Documentation/networking/stmmac.txt b/Documentation/networking/stmmac.txt
index 2903b1cf4d70..d64a14714236 100644
--- a/Documentation/networking/stmmac.txt
+++ b/Documentation/networking/stmmac.txt
@@ -254,7 +254,7 @@ static struct fixed_phy_status stmmac0_fixed_phy_status = {
 
 During the board's device_init we can configure the first
 MAC for fixed_link by calling:
-  fixed_phy_add(PHY_POLL, 1, &stmmac0_fixed_phy_status));)
+  fixed_phy_add(PHY_POLL, 1, &stmmac0_fixed_phy_status, -1);
 and the second one, with a real PHY device attached to the bus,
 by using the stmmac_mdio_bus_data structure (to provide the id, the
 reset procedure etc).
diff --git a/arch/m68k/coldfire/m5272.c b/arch/m68k/coldfire/m5272.c
index b15219ed22bf..c525e4c08f84 100644
--- a/arch/m68k/coldfire/m5272.c
+++ b/arch/m68k/coldfire/m5272.c
@@ -126,7 +126,7 @@ static struct fixed_phy_status nettel_fixed_phy_status __initdata = {
 static int __init init_BSP(void)
 {
         m5272_uarts_init();
-        fixed_phy_add(PHY_POLL, 0, &nettel_fixed_phy_status);
+        fixed_phy_add(PHY_POLL, 0, &nettel_fixed_phy_status, -1);
         return 0;
 }
 
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index be9ff1673ded..298b97715d5f 100644
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -679,7 +679,8 @@ static int __init ar7_register_devices(void)
         }
 
         if (ar7_has_high_cpmac()) {
-                res = fixed_phy_add(PHY_POLL, cpmac_high.id, &fixed_phy_status);
+                res = fixed_phy_add(PHY_POLL, cpmac_high.id,
+                                    &fixed_phy_status, -1);
                 if (!res) {
                         cpmac_get_mac(1, cpmac_high_data.dev_addr);
 
@@ -692,7 +693,7 @@ static int __init ar7_register_devices(void)
         } else
                 cpmac_low_data.phy_mask = 0xffffffff;
 
-        res = fixed_phy_add(PHY_POLL, cpmac_low.id, &fixed_phy_status);
+        res = fixed_phy_add(PHY_POLL, cpmac_low.id, &fixed_phy_status, -1);
         if (!res) {
                 cpmac_get_mac(0, cpmac_low_data.dev_addr);
                 res = platform_device_register(&cpmac_low);
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index 98c075f81795..17503a05938e 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -263,7 +263,7 @@ static int __init bcm47xx_register_bus_complete(void)
         bcm47xx_leds_register();
         bcm47xx_workarounds();
 
-        fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status);
+        fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status, -1);
         return 0;
 }
 device_initcall(bcm47xx_register_bus_complete);
diff --git a/drivers/net/dsa/mv88e6123_61_65.c b/drivers/net/dsa/mv88e6123_61_65.c
index 71a29a7ce538..3de2a6d73fdc 100644
--- a/drivers/net/dsa/mv88e6123_61_65.c
+++ b/drivers/net/dsa/mv88e6123_61_65.c
@@ -129,6 +129,7 @@ struct dsa_switch_driver mv88e6123_61_65_switch_driver = {
         .get_strings            = mv88e6xxx_get_strings,
         .get_ethtool_stats      = mv88e6xxx_get_ethtool_stats,
         .get_sset_count         = mv88e6xxx_get_sset_count,
+        .adjust_link            = mv88e6xxx_adjust_link,
 #ifdef CONFIG_NET_DSA_HWMON
         .get_temp               = mv88e6xxx_get_temp,
 #endif
diff --git a/drivers/net/dsa/mv88e6131.c b/drivers/net/dsa/mv88e6131.c
index 32f4a08e9bc9..3e8386529965 100644
--- a/drivers/net/dsa/mv88e6131.c
+++ b/drivers/net/dsa/mv88e6131.c
@@ -182,6 +182,7 @@ struct dsa_switch_driver mv88e6131_switch_driver = {
         .get_strings            = mv88e6xxx_get_strings,
         .get_ethtool_stats      = mv88e6xxx_get_ethtool_stats,
         .get_sset_count         = mv88e6xxx_get_sset_count,
+        .adjust_link            = mv88e6xxx_adjust_link,
 };
 
 MODULE_ALIAS("platform:mv88e6085");
diff --git a/drivers/net/dsa/mv88e6171.c b/drivers/net/dsa/mv88e6171.c
index 735f04cd83ee..d54b7400e8d8 100644
--- a/drivers/net/dsa/mv88e6171.c
+++ b/drivers/net/dsa/mv88e6171.c
@@ -108,6 +108,7 @@ struct dsa_switch_driver mv88e6171_switch_driver = {
         .get_strings            = mv88e6xxx_get_strings,
         .get_ethtool_stats      = mv88e6xxx_get_ethtool_stats,
         .get_sset_count         = mv88e6xxx_get_sset_count,
+        .adjust_link            = mv88e6xxx_adjust_link,
 #ifdef CONFIG_NET_DSA_HWMON
         .get_temp               = mv88e6xxx_get_temp,
 #endif
diff --git a/drivers/net/dsa/mv88e6352.c b/drivers/net/dsa/mv88e6352.c
index 14b71779df99..1f5129c105fb 100644
--- a/drivers/net/dsa/mv88e6352.c
+++ b/drivers/net/dsa/mv88e6352.c
@@ -328,6 +328,7 @@ struct dsa_switch_driver mv88e6352_switch_driver = {
         .get_strings            = mv88e6xxx_get_strings,
         .get_ethtool_stats      = mv88e6xxx_get_ethtool_stats,
         .get_sset_count         = mv88e6xxx_get_sset_count,
+        .adjust_link            = mv88e6xxx_adjust_link,
         .set_eee                = mv88e6xxx_set_eee,
         .get_eee                = mv88e6xxx_get_eee,
 #ifdef CONFIG_NET_DSA_HWMON
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index 3774f53d28d7..6f13f7206762 100644
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
@@ -14,6 +14,7 @@
 #include <linux/debugfs.h>
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
+#include <linux/ethtool.h>
 #include <linux/if_bridge.h>
 #include <linux/jiffies.h>
 #include <linux/list.h>
@@ -394,6 +395,7 @@ void mv88e6xxx_poll_link(struct dsa_switch *ds)
         for (i = 0; i < DSA_MAX_PORTS; i++) {
                 struct net_device *dev;
                 int uninitialized_var(port_status);
+                int pcs_ctrl;
                 int link;
                 int speed;
                 int duplex;
@@ -403,6 +405,10 @@ void mv88e6xxx_poll_link(struct dsa_switch *ds)
                 if (dev == NULL)
                         continue;
 
+                pcs_ctrl = mv88e6xxx_reg_read(ds, REG_PORT(i), PORT_PCS_CTRL);
+                if (pcs_ctrl < 0 || pcs_ctrl & PORT_PCS_CTRL_FORCE_LINK)
+                        continue;
+
                 link = 0;
                 if (dev->flags & IFF_UP) {
                         port_status = mv88e6xxx_reg_read(ds, REG_PORT(i),
@@ -560,6 +566,73 @@ static bool mv88e6xxx_6352_family(struct dsa_switch *ds)
         return false;
 }
 
+/* We expect the switch to perform auto negotiation if there is a real
+ * phy. However, in the case of a fixed link phy, we force the port
+ * settings from the fixed link settings.
+ */
+void mv88e6xxx_adjust_link(struct dsa_switch *ds, int port,
+                           struct phy_device *phydev)
+{
+        struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
+        u32 ret, reg;
+
+        if (!phy_is_pseudo_fixed_link(phydev))
+                return;
+
+        mutex_lock(&ps->smi_mutex);
+
+        ret = _mv88e6xxx_reg_read(ds, REG_PORT(port), PORT_PCS_CTRL);
+        if (ret < 0)
+                goto out;
+
+        reg = ret & ~(PORT_PCS_CTRL_LINK_UP |
+                      PORT_PCS_CTRL_FORCE_LINK |
+                      PORT_PCS_CTRL_DUPLEX_FULL |
+                      PORT_PCS_CTRL_FORCE_DUPLEX |
+                      PORT_PCS_CTRL_UNFORCED);
+
+        reg |= PORT_PCS_CTRL_FORCE_LINK;
+        if (phydev->link)
+                        reg |= PORT_PCS_CTRL_LINK_UP;
+
+        if (mv88e6xxx_6065_family(ds) && phydev->speed > SPEED_100)
+                goto out;
+
+        switch (phydev->speed) {
+        case SPEED_1000:
+                reg |= PORT_PCS_CTRL_1000;
+                break;
+        case SPEED_100:
+                reg |= PORT_PCS_CTRL_100;
+                break;
+        case SPEED_10:
+                reg |= PORT_PCS_CTRL_10;
+                break;
+        default:
+                pr_info("Unknown speed");
+                goto out;
+        }
+
+        reg |= PORT_PCS_CTRL_FORCE_DUPLEX;
+        if (phydev->duplex == DUPLEX_FULL)
+                reg |= PORT_PCS_CTRL_DUPLEX_FULL;
+
+        if ((mv88e6xxx_6352_family(ds) || mv88e6xxx_6351_family(ds)) &&
+            (port >= ps->num_ports - 2)) {
+                if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
+                        reg |= PORT_PCS_CTRL_RGMII_DELAY_RXCLK;
+                if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
+                        reg |= PORT_PCS_CTRL_RGMII_DELAY_TXCLK;
+                if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
+                        reg |= (PORT_PCS_CTRL_RGMII_DELAY_RXCLK |
+                                PORT_PCS_CTRL_RGMII_DELAY_TXCLK);
+        }
+        _mv88e6xxx_reg_write(ds, REG_PORT(port), PORT_PCS_CTRL, reg);
+
+out:
+        mutex_unlock(&ps->smi_mutex);
+}
+
 /* Must be called with SMI mutex held */
 static int _mv88e6xxx_stats_wait(struct dsa_switch *ds)
 {
diff --git a/drivers/net/dsa/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx.h
index 72ca887feb0d..9b6f3d9d5ae1 100644
--- a/drivers/net/dsa/mv88e6xxx.h
+++ b/drivers/net/dsa/mv88e6xxx.h
@@ -46,6 +46,8 @@
 #define PORT_STATUS_TX_PAUSED   BIT(5)
 #define PORT_STATUS_FLOW_CTRL   BIT(4)
 #define PORT_PCS_CTRL           0x01
+#define PORT_PCS_CTRL_RGMII_DELAY_RXCLK BIT(15)
+#define PORT_PCS_CTRL_RGMII_DELAY_TXCLK BIT(14)
 #define PORT_PCS_CTRL_FC                BIT(7)
 #define PORT_PCS_CTRL_FORCE_FC          BIT(6)
 #define PORT_PCS_CTRL_LINK_UP           BIT(5)
@@ -446,6 +448,8 @@ void mv88e6xxx_get_ethtool_stats(struct dsa_switch *ds, int port,
                                  uint64_t *data);
 int mv88e6xxx_get_sset_count(struct dsa_switch *ds);
 int mv88e6xxx_get_sset_count_basic(struct dsa_switch *ds);
+void mv88e6xxx_adjust_link(struct dsa_switch *ds, int port,
+                           struct phy_device *phydev);
 int mv88e6xxx_get_regs_len(struct dsa_switch *ds, int port);
 void mv88e6xxx_get_regs(struct dsa_switch *ds, int port,
                         struct ethtool_regs *regs, void *_p);
diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
index b3679ad1c1c7..c8affad76f36 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@ -585,7 +585,7 @@ static int bcmgenet_mii_pd_init(struct bcmgenet_priv *priv)
                         .asym_pause = 0,
                 };
 
-                phydev = fixed_phy_register(PHY_POLL, &fphy_status, NULL);
+                phydev = fixed_phy_register(PHY_POLL, &fphy_status, -1, NULL);
                 if (!phydev || IS_ERR(phydev)) {
                         dev_err(kdev, "failed to register fixed PHY device\n");
                         return -ENODEV;
diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c
index 99d9bc19c94a..12c7eb2c604e 100644
--- a/drivers/net/phy/fixed_phy.c
+++ b/drivers/net/phy/fixed_phy.c
@@ -22,6 +22,7 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/of.h>
+#include <linux/gpio.h>
 
 #define MII_REGS_NUM 29
 
@@ -38,6 +39,7 @@ struct fixed_phy {
         struct fixed_phy_status status;
         int (*link_update)(struct net_device *, struct fixed_phy_status *);
         struct list_head node;
+        int link_gpio;
 };
 
 static struct platform_device *pdev;
@@ -52,61 +54,87 @@ static int fixed_phy_update_regs(struct fixed_phy *fp)
         u16 lpagb = 0;
         u16 lpa = 0;
 
-        if (!fp->status.link)
-                goto done;
-        bmsr |= BMSR_LSTATUS | BMSR_ANEGCOMPLETE;
+        if (gpio_is_valid(fp->link_gpio))
+                fp->status.link = !!gpio_get_value_cansleep(fp->link_gpio);
 
         if (fp->status.duplex) {
-                bmcr |= BMCR_FULLDPLX;
-
                 switch (fp->status.speed) {
                 case 1000:
                         bmsr |= BMSR_ESTATEN;
-                        bmcr |= BMCR_SPEED1000;
-                        lpagb |= LPA_1000FULL;
                         break;
                 case 100:
                         bmsr |= BMSR_100FULL;
-                        bmcr |= BMCR_SPEED100;
-                        lpa |= LPA_100FULL;
                         break;
                 case 10:
                         bmsr |= BMSR_10FULL;
-                        lpa |= LPA_10FULL;
                         break;
                 default:
-                        pr_warn("fixed phy: unknown speed\n");
-                        return -EINVAL;
+                        break;
                 }
         } else {
                 switch (fp->status.speed) {
                 case 1000:
                         bmsr |= BMSR_ESTATEN;
-                        bmcr |= BMCR_SPEED1000;
-                        lpagb |= LPA_1000HALF;
                         break;
                 case 100:
                         bmsr |= BMSR_100HALF;
-                        bmcr |= BMCR_SPEED100;
-                        lpa |= LPA_100HALF;
                         break;
                 case 10:
                         bmsr |= BMSR_10HALF;
-                        lpa |= LPA_10HALF;
                         break;
                 default:
-                        pr_warn("fixed phy: unknown speed\n");
-                        return -EINVAL;
+                        break;
                 }
         }
 
-        if (fp->status.pause)
-                lpa |= LPA_PAUSE_CAP;
+        if (fp->status.link) {
+                bmsr |= BMSR_LSTATUS | BMSR_ANEGCOMPLETE;
+
+                if (fp->status.duplex) {
+                        bmcr |= BMCR_FULLDPLX;
+
+                        switch (fp->status.speed) {
+                        case 1000:
+                                bmcr |= BMCR_SPEED1000;
+                                lpagb |= LPA_1000FULL;
+                                break;
+                        case 100:
+                                bmcr |= BMCR_SPEED100;
+                                lpa |= LPA_100FULL;
+                                break;
+                        case 10:
+                                lpa |= LPA_10FULL;
+                                break;
+                        default:
+                                pr_warn("fixed phy: unknown speed\n");
+                                return -EINVAL;
+                        }
+                } else {
+                        switch (fp->status.speed) {
+                        case 1000:
+                                bmcr |= BMCR_SPEED1000;
+                                lpagb |= LPA_1000HALF;
+                                break;
+                        case 100:
+                                bmcr |= BMCR_SPEED100;
+                                lpa |= LPA_100HALF;
+                                break;
+                        case 10:
+                                lpa |= LPA_10HALF;
+                                break;
+                        default:
+                                pr_warn("fixed phy: unknown speed\n");
+                        return -EINVAL;
+                        }
+                }
+
+                if (fp->status.pause)
+                        lpa |= LPA_PAUSE_CAP;
 
-        if (fp->status.asym_pause)
-                lpa |= LPA_PAUSE_ASYM;
+                if (fp->status.asym_pause)
+                        lpa |= LPA_PAUSE_ASYM;
+        }
 
-done:
         fp->regs[MII_PHYSID1] = 0;
         fp->regs[MII_PHYSID2] = 0;
 
@@ -215,7 +243,8 @@ int fixed_phy_update_state(struct phy_device *phydev,
 EXPORT_SYMBOL(fixed_phy_update_state);
 
 int fixed_phy_add(unsigned int irq, int phy_addr,
-                  struct fixed_phy_status *status)
+                  struct fixed_phy_status *status,
+                  int link_gpio)
 {
         int ret;
         struct fixed_mdio_bus *fmb = &platform_fmb;
@@ -231,15 +260,26 @@ int fixed_phy_add(unsigned int irq, int phy_addr,
 
         fp->addr = phy_addr;
         fp->status = *status;
+        fp->link_gpio = link_gpio;
+
+        if (gpio_is_valid(fp->link_gpio)) {
+                ret = gpio_request_one(fp->link_gpio, GPIOF_DIR_IN,
+                                       "fixed-link-gpio-link");
+                if (ret)
+                        goto err_regs;
+        }
 
         ret = fixed_phy_update_regs(fp);
         if (ret)
-                goto err_regs;
+                goto err_gpio;
 
         list_add_tail(&fp->node, &fmb->phys);
 
         return 0;
 
+err_gpio:
+        if (gpio_is_valid(fp->link_gpio))
+                gpio_free(fp->link_gpio);
 err_regs:
         kfree(fp);
         return ret;
@@ -254,6 +294,8 @@ void fixed_phy_del(int phy_addr)
         list_for_each_entry_safe(fp, tmp, &fmb->phys, node) {
                 if (fp->addr == phy_addr) {
                         list_del(&fp->node);
+                        if (gpio_is_valid(fp->link_gpio))
+                                gpio_free(fp->link_gpio);
                         kfree(fp);
                         return;
                 }
@@ -266,6 +308,7 @@ static DEFINE_SPINLOCK(phy_fixed_addr_lock);
 
 struct phy_device *fixed_phy_register(unsigned int irq,
                                       struct fixed_phy_status *status,
+                                      int link_gpio,
                                       struct device_node *np)
 {
         struct fixed_mdio_bus *fmb = &platform_fmb;
@@ -282,7 +325,7 @@ struct phy_device *fixed_phy_register(unsigned int irq,
         phy_addr = phy_fixed_addr++;
         spin_unlock(&phy_fixed_addr_lock);
 
-        ret = fixed_phy_add(PHY_POLL, phy_addr, status);
+        ret = fixed_phy_add(PHY_POLL, phy_addr, status, link_gpio);
         if (ret < 0)
                 return ERR_PTR(ret);
 
@@ -303,6 +346,19 @@ struct phy_device *fixed_phy_register(unsigned int irq,
 
         of_node_get(np);
         phy->dev.of_node = np;
+        phy->is_pseudo_fixed_link = true;
+
+        switch (status->speed) {
+        case SPEED_1000:
+                phy->supported = PHY_1000BT_FEATURES;
+                break;
+        case SPEED_100:
+                phy->supported = PHY_100BT_FEATURES;
+                break;
+        case SPEED_10:
+        default:
+                phy->supported = PHY_10BT_FEATURES;
+        }
 
         ret = phy_device_register(phy);
         if (ret) {
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index 7c8c23cc6896..1350fa25cdb0 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -16,6 +16,7 @@
 #include <linux/phy.h>
 #include <linux/phy_fixed.h>
 #include <linux/of.h>
+#include <linux/of_gpio.h>
 #include <linux/of_irq.h>
 #include <linux/of_mdio.h>
 #include <linux/module.h>
@@ -294,6 +295,7 @@ int of_phy_register_fixed_link(struct device_node *np)
         struct fixed_phy_status status = {};
         struct device_node *fixed_link_node;
         const __be32 *fixed_link_prop;
+        int link_gpio;
         int len, err;
         struct phy_device *phy;
         const char *managed;
@@ -302,7 +304,7 @@ int of_phy_register_fixed_link(struct device_node *np)
         if (err == 0) {
                 if (strcmp(managed, "in-band-status") == 0) {
                         /* status is zeroed, namely its .link member */
-                        phy = fixed_phy_register(PHY_POLL, &status, np);
+                        phy = fixed_phy_register(PHY_POLL, &status, -1, np);
                         return IS_ERR(phy) ? PTR_ERR(phy) : 0;
                 }
         }
@@ -318,8 +320,13 @@ int of_phy_register_fixed_link(struct device_node *np)
                 status.pause = of_property_read_bool(fixed_link_node, "pause");
                 status.asym_pause = of_property_read_bool(fixed_link_node,
                                                           "asym-pause");
+                link_gpio = of_get_named_gpio_flags(fixed_link_node,
+                                                    "link-gpios", 0, NULL);
                 of_node_put(fixed_link_node);
-                phy = fixed_phy_register(PHY_POLL, &status, np);
+                if (link_gpio == -EPROBE_DEFER)
+                        return -EPROBE_DEFER;
+
+                phy = fixed_phy_register(PHY_POLL, &status, link_gpio, np);
                 return IS_ERR(phy) ? PTR_ERR(phy) : 0;
         }
 
@@ -331,7 +338,7 @@ int of_phy_register_fixed_link(struct device_node *np)
                 status.speed = be32_to_cpu(fixed_link_prop[2]);
                 status.pause = be32_to_cpu(fixed_link_prop[3]);
                 status.asym_pause = be32_to_cpu(fixed_link_prop[4]);
-                phy = fixed_phy_register(PHY_POLL, &status, np);
+                phy = fixed_phy_register(PHY_POLL, &status, -1, np);
                 return IS_ERR(phy) ? PTR_ERR(phy) : 0;
         }
 
diff --git a/include/linux/phy.h b/include/linux/phy.h
index e5fb1d415961..962387a192f1 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -330,6 +330,7 @@ struct phy_c45_device_ids {
  * c45_ids: 802.3-c45 Device Identifers if is_c45.
  * is_c45:  Set to true if this phy uses clause 45 addressing.
  * is_internal: Set to true if this phy is internal to a MAC.
+ * is_pseudo_fixed_link: Set to true if this phy is an Ethernet switch, etc.
  * has_fixups: Set to true if this phy has fixups/quirks.
  * suspended: Set to true if this phy has been suspended successfully.
  * state: state of the PHY for management purposes
@@ -368,6 +369,7 @@ struct phy_device {
         struct phy_c45_device_ids c45_ids;
         bool is_c45;
         bool is_internal;
+        bool is_pseudo_fixed_link;
         bool has_fixups;
         bool suspended;
 
@@ -688,6 +690,16 @@ static inline bool phy_interface_is_rgmii(struct phy_device *phydev)
 {
         return phydev->interface >= PHY_INTERFACE_MODE_RGMII &&
                 phydev->interface <= PHY_INTERFACE_MODE_RGMII_TXID;
+};
+
+/*
+ * phy_is_pseudo_fixed_link - Convenience function for testing if this
+ * PHY is the CPU port facing side of an Ethernet switch, or similar.
+ * @phydev: the phy_device struct
+ */
+static inline bool phy_is_pseudo_fixed_link(struct phy_device *phydev)
+{
+        return phydev->is_pseudo_fixed_link;
 }
 
 /**
diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h
index fe5732d53eda..2400d2ea4f34 100644
--- a/include/linux/phy_fixed.h
+++ b/include/linux/phy_fixed.h
@@ -13,9 +13,11 @@ struct device_node;
 
 #if IS_ENABLED(CONFIG_FIXED_PHY)
 extern int fixed_phy_add(unsigned int irq, int phy_id,
-                         struct fixed_phy_status *status);
+                         struct fixed_phy_status *status,
+                         int link_gpio);
 extern struct phy_device *fixed_phy_register(unsigned int irq,
                                              struct fixed_phy_status *status,
+                                             int link_gpio,
                                              struct device_node *np);
 extern void fixed_phy_del(int phy_addr);
 extern int fixed_phy_set_link_update(struct phy_device *phydev,
@@ -26,12 +28,14 @@ extern int fixed_phy_update_state(struct phy_device *phydev,
                            const struct fixed_phy_status *changed);
 #else
 static inline int fixed_phy_add(unsigned int irq, int phy_id,
-                                struct fixed_phy_status *status)
+                                struct fixed_phy_status *status,
+                                int link_gpio)
 {
         return -ENODEV;
 }
 static inline struct phy_device *fixed_phy_register(unsigned int irq,
                                                 struct fixed_phy_status *status,
+                                                int gpio_link,
                                                 struct device_node *np)
 {
         return ERR_PTR(-ENODEV);
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 053eb2b8e682..76e3800765f8 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -176,6 +176,41 @@ __ATTRIBUTE_GROUPS(dsa_hwmon);
 #endif /* CONFIG_NET_DSA_HWMON */
 
 /* basic switch operations **************************************************/
+static int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct net_device *master)
+{
+        struct dsa_chip_data *cd = ds->pd;
+        struct device_node *port_dn;
+        struct phy_device *phydev;
+        int ret, port, mode;
+
+        for (port = 0; port < DSA_MAX_PORTS; port++) {
+                if (!(dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port)))
+                        continue;
+
+                port_dn = cd->port_dn[port];
+                if (of_phy_is_fixed_link(port_dn)) {
+                        ret = of_phy_register_fixed_link(port_dn);
+                        if (ret) {
+                                netdev_err(master,
+                                           "failed to register fixed PHY\n");
+                                return ret;
+                        }
+                        phydev = of_phy_find_device(port_dn);
+
+                        mode = of_get_phy_mode(port_dn);
+                        if (mode < 0)
+                                mode = PHY_INTERFACE_MODE_NA;
+                        phydev->interface = mode;
+
+                        genphy_config_init(phydev);
+                        genphy_read_status(phydev);
+                        if (ds->drv->adjust_link)
+                                ds->drv->adjust_link(ds, port, phydev);
+                }
+        }
+        return 0;
+}
+
 static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
 {
         struct dsa_switch_driver *drv = ds->drv;
@@ -297,6 +332,14 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
                 }
         }
 
+        /* Perform configuration of the CPU and DSA ports */
+        ret = dsa_cpu_dsa_setup(ds, dst->master_netdev);
+        if (ret < 0) {
+                netdev_err(dst->master_netdev, "[%d] : can't configure CPU and DSA ports\n",
+                           index);
+                ret = 0;
+        }
+
 #ifdef CONFIG_NET_DSA_HWMON
         /* If the switch provides a temperature sensor,
          * register with hardware monitoring subsystem.