]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: ethernet: ti: am65-cpsw-nuss: fix ports mac sl initialization
authorGrygorii Strashko <grygorii.strashko@ti.com>
Fri, 26 Jun 2020 18:17:06 +0000 (21:17 +0300)
committerDavid S. Miller <davem@davemloft.net>
Tue, 30 Jun 2020 00:06:19 +0000 (17:06 -0700)
The MAC SL has to be initialized for each port otherwise
am65_cpsw_nuss_slave_disable_unused() will crash for disabled ports.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ti/am65-cpsw-nuss.c

index 89ea29a26c3af637e2d0efb7d34381423b4d1c85..7a921a480f296921e65b3ce87618f7ba4ddcf5cb 100644 (file)
@@ -1768,6 +1768,10 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common)
                                common->cpsw_base + AM65_CPSW_NU_FRAM_BASE +
                                (AM65_CPSW_NU_FRAM_PORT_OFFSET * (port_id - 1));
 
+               port->slave.mac_sl = cpsw_sl_get("am65", dev, port->port_base);
+               if (IS_ERR(port->slave.mac_sl))
+                       return PTR_ERR(port->slave.mac_sl);
+
                port->disabled = !of_device_is_available(port_np);
                if (port->disabled)
                        continue;
@@ -1811,10 +1815,6 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common)
                        return ret;
                }
 
-               port->slave.mac_sl = cpsw_sl_get("am65", dev, port->port_base);
-               if (IS_ERR(port->slave.mac_sl))
-                       return PTR_ERR(port->slave.mac_sl);
-
                mac_addr = of_get_mac_address(port_np);
                if (!IS_ERR(mac_addr)) {
                        ether_addr_copy(port->slave.mac_addr, mac_addr);