net: dsa: Allow configuration of CPU & DSA port speeds/duplex
authorAndrew Lunn <andrew@lunn.ch>
Mon, 31 Aug 2015 13:56:49 +0000 (15:56 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 31 Aug 2015 21:48:02 +0000 (14:48 -0700)
By default, DSA and CPU ports are configured to the maximum speed the
switch supports. However there can be use cases where the peer devices
port is slower. Allow a fixed-link property to be used with the DSA
and CPU port in the device tree, and use this information to configure
the port.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/dsa/dsa.c

index 053eb2b8e68281e778f8f605bb3d5ad9b83ae473..afff17341b738033c51903e91aeaba4716f420be 100644 (file)
@@ -176,6 +176,35 @@ __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;
+
+       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);
+                       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 +326,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.