qlcnic: refactor Tx/SDS ring calculation and validation in driver.

o Current driver has duplicate code for validating user input
  for changing Tx/SDS rings using set_channel ethtool interface.
  This patch removes duplicate code and refactored Tx/SDS ring
  validation for 82xx/83xx/84xx series adapter.
o Refactored code now calculates maximum Tx/Rx ring driver can
  support based on Default, NPAR and SRIOV PF/VF mode of driver.

Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 25 insertions, 21 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
index df31be7a7aba..1c07ec250f23 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
@@ -787,6 +787,9 @@ static int qlcnic_process_cmd_ring(struct qlcnic_adapter *adapter,
         struct net_device *netdev = adapter->netdev;
         struct qlcnic_skb_frag *frag;
 
+        if (!spin_trylock(&adapter->tx_clean_lock))
+                return 1;
+
         sw_consumer = tx_ring->sw_consumer;
         hw_consumer = le32_to_cpu(*(tx_ring->hw_consumer));
 
@@ -840,6 +843,7 @@ static int qlcnic_process_cmd_ring(struct qlcnic_adapter *adapter,
          */
         hw_consumer = le32_to_cpu(*(tx_ring->hw_consumer));
         done = (sw_consumer == hw_consumer);
+        spin_unlock(&adapter->tx_clean_lock);
 
         return done;
 }
@@ -1459,18 +1463,18 @@ int qlcnic_82xx_napi_add(struct qlcnic_adapter *adapter,
         struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
         struct qlcnic_host_tx_ring *tx_ring;
 
-        if (qlcnic_alloc_sds_rings(recv_ctx, adapter->max_sds_rings))
+        if (qlcnic_alloc_sds_rings(recv_ctx, adapter->drv_sds_rings))
                 return -ENOMEM;
 
-        for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+        for (ring = 0; ring < adapter->drv_sds_rings; ring++) {
                 sds_ring = &recv_ctx->sds_rings[ring];
                 if (qlcnic_check_multi_tx(adapter) &&
                     !adapter->ahw->diag_test &&
-                    (adapter->max_drv_tx_rings > 1)) {
+                    (adapter->drv_tx_rings > QLCNIC_SINGLE_RING)) {
                         netif_napi_add(netdev, &sds_ring->napi, qlcnic_rx_poll,
                                        NAPI_POLL_WEIGHT);
                 } else {
-                        if (ring == (adapter->max_sds_rings - 1))
+                        if (ring == (adapter->drv_sds_rings - 1))
                                 netif_napi_add(netdev, &sds_ring->napi,
                                                qlcnic_poll,
                                                NAPI_POLL_WEIGHT);
@@ -1487,7 +1491,7 @@ int qlcnic_82xx_napi_add(struct qlcnic_adapter *adapter,
         }
 
         if (qlcnic_check_multi_tx(adapter) && !adapter->ahw->diag_test) {
-                for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
+                for (ring = 0; ring < adapter->drv_tx_rings; ring++) {
                         tx_ring = &adapter->tx_ring[ring];
                         netif_napi_add(netdev, &tx_ring->napi, qlcnic_tx_poll,
                                        NAPI_POLL_WEIGHT);
@@ -1504,7 +1508,7 @@ void qlcnic_82xx_napi_del(struct qlcnic_adapter *adapter)
         struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
         struct qlcnic_host_tx_ring *tx_ring;
 
-        for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+        for (ring = 0; ring < adapter->drv_sds_rings; ring++) {
                 sds_ring = &recv_ctx->sds_rings[ring];
                 netif_napi_del(&sds_ring->napi);
         }
@@ -1512,7 +1516,7 @@ void qlcnic_82xx_napi_del(struct qlcnic_adapter *adapter)
         qlcnic_free_sds_rings(adapter->recv_ctx);
 
         if (qlcnic_check_multi_tx(adapter) && !adapter->ahw->diag_test) {
-                for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
+                for (ring = 0; ring < adapter->drv_tx_rings; ring++) {
                         tx_ring = &adapter->tx_ring[ring];
                         netif_napi_del(&tx_ring->napi);
                 }
@@ -1531,7 +1535,7 @@ void qlcnic_82xx_napi_enable(struct qlcnic_adapter *adapter)
         if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)
                 return;
 
-        for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+        for (ring = 0; ring < adapter->drv_sds_rings; ring++) {
                 sds_ring = &recv_ctx->sds_rings[ring];
                 napi_enable(&sds_ring->napi);
                 qlcnic_enable_int(sds_ring);
@@ -1540,8 +1544,8 @@ void qlcnic_82xx_napi_enable(struct qlcnic_adapter *adapter)
         if (qlcnic_check_multi_tx(adapter) &&
             (adapter->flags & QLCNIC_MSIX_ENABLED) &&
             !adapter->ahw->diag_test &&
-            (adapter->max_drv_tx_rings > 1)) {
-                for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
+            (adapter->drv_tx_rings > QLCNIC_SINGLE_RING)) {
+                for (ring = 0; ring < adapter->drv_tx_rings; ring++) {
                         tx_ring = &adapter->tx_ring[ring];
                         napi_enable(&tx_ring->napi);
                         qlcnic_enable_tx_intr(adapter, tx_ring);
@@ -1559,7 +1563,7 @@ void qlcnic_82xx_napi_disable(struct qlcnic_adapter *adapter)
         if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)
                 return;
 
-        for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+        for (ring = 0; ring < adapter->drv_sds_rings; ring++) {
                 sds_ring = &recv_ctx->sds_rings[ring];
                 qlcnic_disable_int(sds_ring);
                 napi_synchronize(&sds_ring->napi);
@@ -1569,7 +1573,7 @@ void qlcnic_82xx_napi_disable(struct qlcnic_adapter *adapter)
         if ((adapter->flags & QLCNIC_MSIX_ENABLED) &&
             !adapter->ahw->diag_test &&
             qlcnic_check_multi_tx(adapter)) {
-                for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
+                for (ring = 0; ring < adapter->drv_tx_rings; ring++) {
                         tx_ring = &adapter->tx_ring[ring];
                         qlcnic_disable_tx_int(adapter, tx_ring);
                         napi_synchronize(&tx_ring->napi);
@@ -1907,7 +1911,7 @@ void qlcnic_83xx_napi_enable(struct qlcnic_adapter *adapter)
         if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)
                 return;
 
-        for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+        for (ring = 0; ring < adapter->drv_sds_rings; ring++) {
                 sds_ring = &recv_ctx->sds_rings[ring];
                 napi_enable(&sds_ring->napi);
                 if (adapter->flags & QLCNIC_MSIX_ENABLED)
@@ -1916,7 +1920,7 @@ void qlcnic_83xx_napi_enable(struct qlcnic_adapter *adapter)
 
         if ((adapter->flags & QLCNIC_MSIX_ENABLED) &&
             !(adapter->flags & QLCNIC_TX_INTR_SHARED)) {
-                for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
+                for (ring = 0; ring < adapter->drv_tx_rings; ring++) {
                         tx_ring = &adapter->tx_ring[ring];
                         napi_enable(&tx_ring->napi);
                         qlcnic_83xx_enable_tx_intr(adapter, tx_ring);
@@ -1934,7 +1938,7 @@ void qlcnic_83xx_napi_disable(struct qlcnic_adapter *adapter)
         if (adapter->is_up != QLCNIC_ADAPTER_UP_MAGIC)
                 return;
 
-        for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+        for (ring = 0; ring < adapter->drv_sds_rings; ring++) {
                 sds_ring = &recv_ctx->sds_rings[ring];
                 if (adapter->flags & QLCNIC_MSIX_ENABLED)
                         qlcnic_83xx_disable_intr(adapter, sds_ring);
@@ -1944,7 +1948,7 @@ void qlcnic_83xx_napi_disable(struct qlcnic_adapter *adapter)
 
         if ((adapter->flags & QLCNIC_MSIX_ENABLED) &&
             !(adapter->flags & QLCNIC_TX_INTR_SHARED)) {
-                for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
+                for (ring = 0; ring < adapter->drv_tx_rings; ring++) {
                         tx_ring = &adapter->tx_ring[ring];
                         qlcnic_83xx_disable_tx_intr(adapter, tx_ring);
                         napi_synchronize(&tx_ring->napi);
@@ -1961,10 +1965,10 @@ int qlcnic_83xx_napi_add(struct qlcnic_adapter *adapter,
         struct qlcnic_host_tx_ring *tx_ring;
         struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
 
-        if (qlcnic_alloc_sds_rings(recv_ctx, adapter->max_sds_rings))
+        if (qlcnic_alloc_sds_rings(recv_ctx, adapter->drv_sds_rings))
                 return -ENOMEM;
 
-        for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+        for (ring = 0; ring < adapter->drv_sds_rings; ring++) {
                 sds_ring = &recv_ctx->sds_rings[ring];
                 if (adapter->flags & QLCNIC_MSIX_ENABLED) {
                         if (!(adapter->flags & QLCNIC_TX_INTR_SHARED))
@@ -1990,7 +1994,7 @@ int qlcnic_83xx_napi_add(struct qlcnic_adapter *adapter,
 
         if ((adapter->flags & QLCNIC_MSIX_ENABLED) &&
             !(adapter->flags & QLCNIC_TX_INTR_SHARED)) {
-                for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
+                for (ring = 0; ring < adapter->drv_tx_rings; ring++) {
                         tx_ring = &adapter->tx_ring[ring];
                         netif_napi_add(netdev, &tx_ring->napi,
                                        qlcnic_83xx_msix_tx_poll,
@@ -2008,7 +2012,7 @@ void qlcnic_83xx_napi_del(struct qlcnic_adapter *adapter)
         struct qlcnic_recv_context *recv_ctx = adapter->recv_ctx;
         struct qlcnic_host_tx_ring *tx_ring;
 
-        for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+        for (ring = 0; ring < adapter->drv_sds_rings; ring++) {
                 sds_ring = &recv_ctx->sds_rings[ring];
                 netif_napi_del(&sds_ring->napi);
         }
@@ -2017,7 +2021,7 @@ void qlcnic_83xx_napi_del(struct qlcnic_adapter *adapter)
 
         if ((adapter->flags & QLCNIC_MSIX_ENABLED) &&
             !(adapter->flags & QLCNIC_TX_INTR_SHARED)) {
-                for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
+                for (ring = 0; ring < adapter->drv_tx_rings; ring++) {
                         tx_ring = &adapter->tx_ring[ring];
                         netif_napi_del(&tx_ring->napi);
                 }