net: dsa: bcm_sf2: store PHY interface/mode in port structure

It's needed later for proper switch / crossbar setup.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index f277df922fcded6db853d155399e8354287ea299..416f8deffb200a206b6fa4fc0f318307ea0ecfc1 100644 (file)
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -443,10 +443,11 @@ static void bcm_sf2_intr_disable(struct bcm_sf2_priv *priv)
 static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv,
                                   struct device_node *dn)
 {
+       struct device *dev = priv->dev->ds->dev;
+       struct bcm_sf2_port_status *port_st;
        struct device_node *port;
        unsigned int port_num;
        struct property *prop;
-       phy_interface_t mode;
        int err;
 
        priv->moca_port = -1;
@@ -455,19 +456,26 @@ static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv,
                if (of_property_read_u32(port, "reg", &port_num))
                        continue;
 
+               if (port_num >= DSA_MAX_PORTS) {
+                       dev_err(dev, "Invalid port number %d\n", port_num);
+                       continue;
+               }
+
+               port_st = &priv->port_sts[port_num];
+
                /* Internal PHYs get assigned a specific 'phy-mode' property
                 * value: "internal" to help flag them before MDIO probing
                 * has completed, since they might be turned off at that
                 * time
                 */
-               err = of_get_phy_mode(port, &mode);
+               err = of_get_phy_mode(port, &port_st->mode);
                if (err)
                        continue;
 
-               if (mode == PHY_INTERFACE_MODE_INTERNAL)
+               if (port_st->mode == PHY_INTERFACE_MODE_INTERNAL)
                        priv->int_phy_mask |= 1 << port_num;
 
-               if (mode == PHY_INTERFACE_MODE_MOCA)
+               if (port_st->mode == PHY_INTERFACE_MODE_MOCA)
                        priv->moca_port = port_num;
 
                if (of_property_read_bool(port, "brcm,use-bcm-hdr"))

diff --git a/drivers/net/dsa/bcm_sf2.h b/drivers/net/dsa/bcm_sf2.h
index 1ed901a6853617f827eb2d60ea9570c3a74948d9..a0fe0bf46d9f2e483966a1f3341d20ee8f45d559 100644 (file)
--- a/drivers/net/dsa/bcm_sf2.h
+++ b/drivers/net/dsa/bcm_sf2.h
@@ -44,6 +44,7 @@ struct bcm_sf2_hw_params {
 #define BCM_SF2_REGS_NUM       6
 
 struct bcm_sf2_port_status {
+       phy_interface_t mode;
        unsigned int link;
        bool enabled;
 };