1 files changed, 61 insertions, 53 deletions

diff --git a/drivers/net/ethernet/ti/keystone_ethss2.c b/drivers/net/ethernet/ti/keystone_ethss2.c
index 7ff7363575f..f334bdb3ab5 100644
--- a/drivers/net/ethernet/ti/keystone_ethss2.c
+++ b/drivers/net/ethernet/ti/keystone_ethss2.c
@@ -866,7 +866,7 @@ struct cpsw2_priv {
         void __iomem                    *sgmii_port_regs;
 
         struct cpsw_ale                 *ale;
-        u32                              ale_refcnt;
+        atomic_t                         ale_refcnt;
 
         u32                              link[MAX_SLAVES];
         struct device_node              *phy_node[MAX_SLAVES];
@@ -2540,8 +2540,7 @@ static int cpsw2_port_reset(struct cpsw2_slave *slave)
         /* Wait for the bit to clear */
         for (i = 0; i < DEVICE_EMACSL_RESET_POLL_COUNT; i++) {
                 v = readl(&slave->regs->soft_reset);
-                if ((v & SOFT_RESET_MASK) !=
-                    SOFT_RESET)
+                if ((v & SOFT_RESET_MASK) != SOFT_RESET)
                         return 0;
         }
 
@@ -2563,13 +2562,19 @@ static void cpsw2_port_config(struct cpsw2_slave *slave, int max_rx_len)
                 &slave->regs->mac_control);
 }
 
-static void cpsw2_slave_stop(struct cpsw2_slave *slave, struct cpsw2_priv *priv)
+static void cpsw2_slave_stop(struct cpsw2_slave *slave,
+                            struct cpsw2_intf *cpsw_intf)
 {
+        struct cpsw2_priv *cpsw_dev = cpsw_intf->cpsw_priv;
+
         /* disable forwarding */
         if (slave->ale)
                 cpsw_ale_control_set(slave->ale, slave->port_num,
                                 ALE_PORT_STATE, ALE_PORT_STATE_DISABLE);
 
+        keystone_sgmii_rtreset(SGMII2_BASE(slave->slave_num),
+                                slave->slave_num, true);
+
         cpsw2_port_reset(slave);
 
         if (!slave->phy)
@@ -2606,6 +2611,9 @@ static void cpsw2_slave_open(struct cpsw2_slave *slave,
 
         cpsw2_port_reset(slave);
 
+        keystone_sgmii_rtreset(SGMII2_BASE(slave->slave_num),
+                                        slave->slave_num, false);
+
         cpsw2_port_config(slave, cpsw_dev->rx_packet_max);
 
         cpsw2_set_slave_mac(slave, cpsw_intf);
@@ -2647,43 +2655,62 @@ static void cpsw2_slave_open(struct cpsw2_slave *slave,
         }
 }
 
-static void cpsw2_init_host_port(struct cpsw2_priv *priv,
-                                struct cpsw2_intf *cpsw_intf)
+static int cpsw2_init_ale(struct cpsw2_priv *cpsw_dev)
 {
-        int bypass_en = 1;
+        struct cpsw_ale_params ale_params;
 
-        /* Max length register */
-        writel(MAX_SIZE_STREAM_BUFFER,
-                     &priv->host_port_regs->rx_maxlen);
+        memset(&ale_params, 0, sizeof(ale_params));
+
+        ale_params.dev                  = cpsw_dev->dev;
+        ale_params.ale_regs             = (void *)((u32)cpsw_dev->ale_reg);
+        ale_params.ale_ageout           = cpsw_dev->ale_ageout;
+        ale_params.ale_entries          = cpsw_dev->ale_entries;
+        ale_params.ale_ports            = cpsw_dev->ale_ports;
+
+        cpsw_dev->ale = cpsw_ale_create(&ale_params);
+        if (!cpsw_dev->ale) {
+                dev_err(cpsw_dev->dev,
+                        "error initializing ale engine\n");
+                return -ENODEV;
+        }
 
-        if (priv->ale_refcnt == 1)
-                cpsw_ale_start(priv->ale);
+        dev_info(cpsw_dev->dev, "Created a cpsw ale engine\n");
 
-        if (!priv->multi_if)
-                bypass_en = 0;
+        cpsw_ale_start(cpsw_dev->ale);
 
-        cpsw_ale_control_set(priv->ale, 0, ALE_BYPASS, bypass_en);
+        cpsw_ale_control_set(cpsw_dev->ale, 0,
+                             ALE_BYPASS, cpsw_dev->multi_if ? 1 : 0);
 
-        cpsw_ale_control_set(priv->ale, 0, ALE_NO_PORT_VLAN, 1);
+        cpsw_ale_control_set(cpsw_dev->ale, 0, ALE_NO_PORT_VLAN, 1);
 
-        cpsw_ale_control_set(priv->ale, priv->host_port,
+        cpsw_ale_control_set(cpsw_dev->ale, cpsw_dev->host_port,
                              ALE_PORT_STATE, ALE_PORT_STATE_FORWARD);
 
-        cpsw_ale_control_set(priv->ale, 0,
+        cpsw_ale_control_set(cpsw_dev->ale, 0,
                              ALE_PORT_UNKNOWN_VLAN_MEMBER_1R4,
-                             CPSW2_MASK_ALL_PORTS(priv->num_slaves + 1));
+                             CPSW2_MASK_ALL_PORTS(cpsw_dev->num_slaves + 1));
 
-        cpsw_ale_control_set(priv->ale, 0,
+        cpsw_ale_control_set(cpsw_dev->ale, 0,
                              ALE_PORT_UNKNOWN_MCAST_FLOOD_1R4,
-                             CPSW2_MASK_PHYS_PORTS(priv->num_slaves + 1));
+                             CPSW2_MASK_PHYS_PORTS(cpsw_dev->num_slaves + 1));
 
-        cpsw_ale_control_set(priv->ale, 0,
+        cpsw_ale_control_set(cpsw_dev->ale, 0,
                              ALE_PORT_UNKNOWN_REG_MCAST_FLOOD_1R4,
-                             CPSW2_MASK_ALL_PORTS(priv->num_slaves + 1));
+                             CPSW2_MASK_ALL_PORTS(cpsw_dev->num_slaves + 1));
 
-        cpsw_ale_control_set(priv->ale, 0,
+        cpsw_ale_control_set(cpsw_dev->ale, 0,
                              ALE_PORT_UNTAGGED_EGRESS_1R4,
-                             CPSW2_MASK_ALL_PORTS(priv->num_slaves + 1));
+                             CPSW2_MASK_ALL_PORTS(cpsw_dev->num_slaves + 1));
+
+        return 0;
+}
+
+static void cpsw2_init_host_port(struct cpsw2_priv *priv)
+{
+        /* Max length register */
+        writel(MAX_SIZE_STREAM_BUFFER,
+                     &priv->host_port_regs->rx_maxlen);
+
 }
 
 static void cpsw2_slave_init(struct cpsw2_slave *slave, struct cpsw2_priv *priv)
@@ -3377,7 +3404,6 @@ static int cpsw2_open(void *intf_priv, struct net_device *ndev)
         struct cpsw2_intf *cpsw_intf = intf_priv;
         struct cpsw2_priv *cpsw_dev = cpsw_intf->cpsw_priv;
         struct netcp_priv *netcp = netdev_priv(ndev);
-        struct cpsw_ale_params ale_params;
         int ret = 0;
         u32 reg;
 
@@ -3413,38 +3439,23 @@ static int cpsw2_open(void *intf_priv, struct net_device *ndev)
                 cpsw_intf->tx_pipe.dma_channel,
                 cpsw_intf->tx_pipe.dma_psflags);
 
-        cpsw_dev->ale_refcnt++;
-        if (cpsw_dev->ale_refcnt == 1) {
-                memset(&ale_params, 0, sizeof(ale_params));
-
-                ale_params.dev                  = cpsw_dev->dev;
-                ale_params.ale_regs             = (void *)\
-                                                  ((u32)cpsw_dev->ale_reg);
-                ale_params.ale_ageout           = cpsw_dev->ale_ageout;
-                ale_params.ale_entries          = cpsw_dev->ale_entries;
-                ale_params.ale_ports            = cpsw_dev->ale_ports;
-
-                cpsw_dev->ale = cpsw_ale_create(&ale_params);
-                if (!cpsw_dev->ale) {
-                        dev_err(cpsw_dev->dev,
-                                "error initializing ale engine\n");
-                        ret = -ENODEV;
+        if (atomic_inc_return(&cpsw_dev->ale_refcnt) == 1) {
+                ret = cpsw2_init_ale(cpsw_dev);
+                if (ret < 0) {
+                        atomic_dec(&cpsw_dev->ale_refcnt);
                         goto ale_fail;
-                } else
-                        dev_info(cpsw_dev->dev, "Created a cpsw ale engine\n");
+                }
+                cpsw2_init_host_port(cpsw_dev);
         }
 
         for_each_slave(cpsw_intf, cpsw2_slave_init, cpsw_dev);
 
-        for_each_slave(cpsw_intf, cpsw2_slave_stop, cpsw_dev);
+        for_each_slave(cpsw_intf, cpsw2_slave_stop, cpsw_intf);
 
         /* Serdes init */
         if (cpsw_dev->init_serdes_at_probe == 0)
                 cpsw2_serdes_init(cpsw_dev);
 
-        /* initialize host and slave ports */
-        cpsw2_init_host_port(cpsw_dev, cpsw_intf);
-
         /* disable priority elevation and enable statistics on all ports */
         writel(0, &cpsw_dev->regs->ptype);
 
@@ -3499,11 +3510,10 @@ static int cpsw2_close(void *intf_priv, struct net_device *ndev)
 
         del_timer_sync(&cpsw_intf->timer);
 
-        cpsw_dev->ale_refcnt--;
-        if (!cpsw_dev->ale_refcnt)
+        if (atomic_dec_return(&cpsw_dev->ale_refcnt) == 0)
                 cpsw_ale_stop(cpsw_dev->ale);
 
-        for_each_slave(cpsw_intf, cpsw2_slave_stop, cpsw_dev);
+        for_each_slave(cpsw_intf, cpsw2_slave_stop, cpsw_intf);
 
         if (!cpsw_dev->force_no_hwtstamp)
                 netcp_unregister_rxhook(netcp, CPSW2_RXHOOK_ORDER,
@@ -4057,8 +4067,6 @@ static int cpsw2_attach(void *inst_priv, struct net_device *ndev,
         netcp_txpipe_init(&cpsw_intf->tx_pipe, netdev_priv(ndev),
                           cpsw_intf->tx_chan_name, cpsw_intf->tx_queue_depth);
 
-        cpsw_intf->tx_pipe.dma_psflags  = netcp->cpsw_port;
-
         SET_ETHTOOL_OPS(ndev, &keystone_ethtool_ops);
 
         list_add(&cpsw_intf->cpsw_intf_list, &cpsw_dev->cpsw_intf_head);