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, 11 insertions, 9 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
index 86850dd633a1..859cb161fc63 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
@@ -270,7 +270,7 @@ int qlcnic_82xx_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
         int err;
 
         nrds_rings = adapter->max_rds_rings;
-        nsds_rings = adapter->max_sds_rings;
+        nsds_rings = adapter->drv_sds_rings;
 
         rq_size = SIZEOF_HOSTRQ_RX(struct qlcnic_hostrq_rx_ctx, nrds_rings,
                                    nsds_rings);
@@ -475,7 +475,7 @@ int qlcnic_82xx_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter,
 
         if (qlcnic_check_multi_tx(adapter) &&
             !adapter->ahw->diag_test) {
-                temp_nsds_rings = adapter->max_sds_rings;
+                temp_nsds_rings = adapter->drv_sds_rings;
                 index = temp_nsds_rings + ring;
                 msix_id = ahw->intr_tbl[index].id;
                 prq->msi_index = cpu_to_le16(msix_id);
@@ -512,7 +512,7 @@ int qlcnic_82xx_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter,
                 if (qlcnic_check_multi_tx(adapter) &&
                     !adapter->ahw->diag_test &&
                     (adapter->flags & QLCNIC_MSIX_ENABLED)) {
-                        index = adapter->max_sds_rings + ring;
+                        index = adapter->drv_sds_rings + ring;
                         intr_mask = ahw->intr_tbl[index].src;
                         tx_ring->crb_intr_mask = ahw->pci_base0 + intr_mask;
                 }
@@ -582,7 +582,7 @@ int qlcnic_alloc_hw_resources(struct qlcnic_adapter *adapter)
 
         recv_ctx = adapter->recv_ctx;
 
-        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];
                 ptr = (__le32 *)dma_alloc_coherent(&pdev->dev, sizeof(u32),
                                                    &tx_ring->hw_cons_phys_addr,
@@ -616,7 +616,7 @@ int qlcnic_alloc_hw_resources(struct qlcnic_adapter *adapter)
 
         }
 
-        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];
 
                 addr = dma_alloc_coherent(&adapter->pdev->dev,
@@ -664,7 +664,7 @@ int qlcnic_fw_create_ctx(struct qlcnic_adapter *dev)
         if (err)
                 goto err_out;
 
-        for (ring = 0; ring < dev->max_drv_tx_rings; ring++) {
+        for (ring = 0; ring < dev->drv_tx_rings; ring++) {
                 err = qlcnic_fw_cmd_create_tx_ctx(dev,
                                                   &dev->tx_ring[ring],
                                                   ring);
@@ -703,7 +703,7 @@ void qlcnic_fw_destroy_ctx(struct qlcnic_adapter *adapter)
 
         if (test_and_clear_bit(__QLCNIC_FW_ATTACHED, &adapter->state)) {
                 qlcnic_fw_cmd_del_rx_ctx(adapter);
-                for (ring = 0; ring < adapter->max_drv_tx_rings; ring++)
+                for (ring = 0; ring < adapter->drv_tx_rings; ring++)
                         qlcnic_fw_cmd_del_tx_ctx(adapter,
                                                  &adapter->tx_ring[ring]);
 
@@ -733,7 +733,7 @@ void qlcnic_free_hw_resources(struct qlcnic_adapter *adapter)
 
         recv_ctx = adapter->recv_ctx;
 
-        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];
                 if (tx_ring->hw_consumer != NULL) {
                         dma_free_coherent(&adapter->pdev->dev, sizeof(u32),
@@ -764,7 +764,7 @@ void qlcnic_free_hw_resources(struct qlcnic_adapter *adapter)
                 }
         }
 
-        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 (sds_ring->desc_head != NULL) {
@@ -895,6 +895,8 @@ int qlcnic_82xx_get_nic_info(struct qlcnic_adapter *adapter,
                 npar_info->max_rx_ques = le16_to_cpu(nic_info->max_rx_ques);
                 npar_info->capabilities = le32_to_cpu(nic_info->capabilities);
                 npar_info->max_mtu = le16_to_cpu(nic_info->max_mtu);
+                adapter->max_tx_rings = npar_info->max_tx_ques;
+                adapter->max_sds_rings = npar_info->max_rx_ques;
         }
 
         qlcnic_free_mbx_args(&cmd);