sf: Query write-protection status before operating the flash

[platform/kernel/u-boot.git] / net / dsa-uclass.c

diff --git a/net/dsa-uclass.c b/net/dsa-uclass.c
index 9b8ae1e..3bf4351 100644 (file)
--- a/net/dsa-uclass.c
+++ b/net/dsa-uclass.c
@@ -44,6 +44,26 @@ int dsa_set_tagging(struct udevice *dev, ushort headroom, ushort tailroom)
        return 0;
 }
 
+ofnode dsa_port_get_ofnode(struct udevice *dev, int port)
+{
+       struct dsa_pdata *pdata = dev_get_uclass_plat(dev);
+       struct dsa_port_pdata *port_pdata;
+       struct udevice *pdev;
+
+       if (port == pdata->cpu_port)
+               return pdata->cpu_port_node;
+
+       for (device_find_first_child(dev, &pdev);
+            pdev;
+            device_find_next_child(&pdev)) {
+               port_pdata = dev_get_parent_plat(pdev);
+               if (port_pdata->index == port)
+                       return dev_ofnode(pdev);
+       }
+
+       return ofnode_null();
+}
+
 /* returns the DSA master Ethernet device */
 struct udevice *dsa_get_master(struct udevice *dev)
 {
@@ -100,7 +120,7 @@ static void dsa_port_stop(struct udevice *pdev)
 
                port_pdata = dev_get_parent_plat(pdev);
                ops->port_disable(dev, port_pdata->index, port_pdata->phy);
-               ops->port_disable(dev, priv->cpu_port, NULL);
+               ops->port_disable(dev, priv->cpu_port, priv->cpu_port_fixed_phy);
        }
 
        eth_get_ops(master)->stop(master);
@@ -199,9 +219,7 @@ static int dsa_port_free_pkt(struct udevice *pdev, uchar *packet, int length)
 static int dsa_port_of_to_pdata(struct udevice *pdev)
 {
        struct dsa_port_pdata *port_pdata;
-       struct dsa_pdata *dsa_pdata;
        struct eth_pdata *eth_pdata;
-       struct udevice *dev;
        const char *label;
        u32 index;
        int err;
@@ -213,15 +231,12 @@ static int dsa_port_of_to_pdata(struct udevice *pdev)
        if (err)
                return err;
 
-       dev = dev_get_parent(pdev);
-       dsa_pdata = dev_get_uclass_plat(dev);
-
        port_pdata = dev_get_parent_plat(pdev);
        port_pdata->index = index;
 
        label = ofnode_read_string(dev_ofnode(pdev), "label");
        if (label)
-               strncpy(port_pdata->name, label, DSA_PORT_NAME_LENGTH);
+               strlcpy(port_pdata->name, label, DSA_PORT_NAME_LENGTH);
 
        eth_pdata = dev_get_plat(pdev);
        eth_pdata->priv_pdata = port_pdata;
@@ -255,7 +270,7 @@ static void dsa_port_set_hwaddr(struct udevice *pdev, struct udevice *master)
                struct eth_ops *eth_ops = eth_get_ops(master);
 
                if (eth_ops->set_promisc)
-                       eth_ops->set_promisc(master, 1);
+                       eth_ops->set_promisc(master, true);
 
                return;
        }
@@ -272,12 +287,10 @@ static int dsa_port_probe(struct udevice *pdev)
        struct udevice *dev = dev_get_parent(pdev);
        struct dsa_ops *ops = dsa_get_ops(dev);
        struct dsa_port_pdata *port_pdata;
-       struct dsa_priv *dsa_priv;
        struct udevice *master;
        int err;
 
        port_pdata = dev_get_parent_plat(pdev);
-       dsa_priv = dev_get_uclass_priv(dev);
 
        port_pdata->phy = dm_eth_phy_connect(pdev);
        if (!port_pdata->phy)
@@ -312,12 +325,7 @@ static int dsa_port_probe(struct udevice *pdev)
 
 static int dsa_port_remove(struct udevice *pdev)
 {
-       struct udevice *dev = dev_get_parent(pdev);
-       struct dsa_port_pdata *port_pdata;
-       struct dsa_priv *dsa_priv;
-
-       port_pdata = dev_get_parent_plat(pdev);
-       dsa_priv = dev_get_uclass_priv(dev);
+       struct dsa_port_pdata *port_pdata = dev_get_parent_plat(pdev);
 
        port_pdata->phy = NULL;
 
@@ -433,7 +441,7 @@ static int dsa_post_bind(struct udevice *dev)
                        struct dsa_port_pdata *port_pdata;
 
                        port_pdata = dev_get_parent_plat(pdev);
-                       strncpy(port_pdata->name, name, DSA_PORT_NAME_LENGTH);
+                       strlcpy(port_pdata->name, name, DSA_PORT_NAME_LENGTH);
                        pdev->name = port_pdata->name;
                }
 
@@ -458,6 +466,8 @@ static int dsa_pre_probe(struct udevice *dev)
 {
        struct dsa_pdata *pdata = dev_get_uclass_plat(dev);
        struct dsa_priv *priv = dev_get_uclass_priv(dev);
+       struct dsa_ops *ops = dsa_get_ops(dev);
+       int err;
 
        priv->num_ports = pdata->num_ports;
        priv->cpu_port = pdata->cpu_port;
@@ -467,8 +477,19 @@ static int dsa_pre_probe(struct udevice *dev)
                return -ENODEV;
        }
 
-       uclass_find_device_by_ofnode(UCLASS_ETH, pdata->master_node,
-                                    &priv->master_dev);
+       err = uclass_get_device_by_ofnode(UCLASS_ETH, pdata->master_node,
+                                         &priv->master_dev);
+       if (err)
+               return err;
+
+       /* Simulate a probing event for the CPU port */
+       if (ops->port_probe) {
+               err = ops->port_probe(dev, priv->cpu_port,
+                                     priv->cpu_port_fixed_phy);
+               if (err)
+                       return err;
+       }
+
        return 0;
 }