1 files changed, 34 insertions, 35 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index 359e0f279b71..df6c6f51c609 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -13,7 +13,6 @@
 #include <linux/interrupt.h>
 #include <linux/aer.h>
 
-#define QLCNIC_MAX_TX_QUEUES            1
 #define RSS_HASHTYPE_IP_TCP             0x3
 #define QLC_83XX_FW_MBX_CMD             0
 
@@ -268,20 +267,18 @@ int qlcnic_83xx_wrt_reg_indirect(struct qlcnic_adapter *adapter, ulong addr,
         }
 }
 
-int qlcnic_83xx_setup_intr(struct qlcnic_adapter *adapter, u8 num_intr, int txq)
+int qlcnic_83xx_setup_intr(struct qlcnic_adapter *adapter)
 {
         int err, i, num_msix;
         struct qlcnic_hardware_context *ahw = adapter->ahw;
 
-        if (!num_intr)
-                num_intr = QLCNIC_DEF_NUM_STS_DESC_RINGS;
-        num_msix = rounddown_pow_of_two(min_t(int, num_online_cpus(),
-                                              num_intr));
+        num_msix = adapter->drv_sds_rings;
+
         /* account for AEN interrupt MSI-X based interrupts */
         num_msix += 1;
 
         if (!(adapter->flags & QLCNIC_TX_INTR_SHARED))
-                num_msix += adapter->max_drv_tx_rings;
+                num_msix += adapter->drv_tx_rings;
 
         err = qlcnic_enable_msix(adapter, num_msix);
         if (err == -ENOMEM)
@@ -986,14 +983,14 @@ static int qlcnic_83xx_add_rings(struct qlcnic_adapter *adapter)
 
         sds_mbx_size = sizeof(struct qlcnic_sds_mbx);
         context_id = recv_ctx->context_id;
-        num_sds = (adapter->max_sds_rings - QLCNIC_MAX_RING_SETS);
+        num_sds = adapter->drv_sds_rings - QLCNIC_MAX_SDS_RINGS;
         ahw->hw_ops->alloc_mbx_args(&cmd, adapter,
                                     QLCNIC_CMD_ADD_RCV_RINGS);
         cmd.req.arg[1] = 0 | (num_sds << 8) | (context_id << 16);
 
         /* set up status rings, mbx 2-81 */
         index = 2;
-        for (i = 8; i < adapter->max_sds_rings; i++) {
+        for (i = 8; i < adapter->drv_sds_rings; i++) {
                 memset(&sds_mbx, 0, sds_mbx_size);
                 sds = &recv_ctx->sds_rings[i];
                 sds->consumer = 0;
@@ -1028,7 +1025,7 @@ static int qlcnic_83xx_add_rings(struct qlcnic_adapter *adapter)
         mbx_out = (struct qlcnic_add_rings_mbx_out *)&cmd.rsp.arg[1];
         index = 0;
         /* status descriptor ring */
-        for (i = 8; i < adapter->max_sds_rings; i++) {
+        for (i = 8; i < adapter->drv_sds_rings; i++) {
                 sds = &recv_ctx->sds_rings[i];
                 sds->crb_sts_consumer = ahw->pci_base0 +
                                         mbx_out->host_csmr[index];
@@ -1086,10 +1083,10 @@ int qlcnic_83xx_create_rx_ctx(struct qlcnic_adapter *adapter)
         struct qlcnic_hardware_context *ahw = adapter->ahw;
         num_rds = adapter->max_rds_rings;
 
-        if (adapter->max_sds_rings <= QLCNIC_MAX_RING_SETS)
-                num_sds = adapter->max_sds_rings;
+        if (adapter->drv_sds_rings <= QLCNIC_MAX_SDS_RINGS)
+                num_sds = adapter->drv_sds_rings;
         else
-                num_sds = QLCNIC_MAX_RING_SETS;
+                num_sds = QLCNIC_MAX_SDS_RINGS;
 
         sds_mbx_size = sizeof(struct qlcnic_sds_mbx);
         rds_mbx_size = sizeof(struct qlcnic_rds_mbx);
@@ -1190,7 +1187,7 @@ int qlcnic_83xx_create_rx_ctx(struct qlcnic_adapter *adapter)
                 sds->crb_intr_mask = ahw->pci_base0 + intr_mask;
         }
 
-        if (adapter->max_sds_rings > QLCNIC_MAX_RING_SETS)
+        if (adapter->drv_sds_rings > QLCNIC_MAX_SDS_RINGS)
                 err = qlcnic_83xx_add_rings(adapter);
 out:
         qlcnic_free_mbx_args(&cmd);
@@ -1246,9 +1243,9 @@ int qlcnic_83xx_create_tx_ctx(struct qlcnic_adapter *adapter,
         mbx.size = tx->num_desc;
         if (adapter->flags & QLCNIC_MSIX_ENABLED) {
                 if (!(adapter->flags & QLCNIC_TX_INTR_SHARED))
-                        msix_vector = adapter->max_sds_rings + ring;
+                        msix_vector = adapter->drv_sds_rings + ring;
                 else
-                        msix_vector = adapter->max_sds_rings - 1;
+                        msix_vector = adapter->drv_sds_rings - 1;
                 msix_id = ahw->intr_tbl[msix_vector].id;
         } else {
                 msix_id = QLCRDX(ahw, QLCNIC_DEF_INT_ID);
@@ -1271,7 +1268,8 @@ int qlcnic_83xx_create_tx_ctx(struct qlcnic_adapter *adapter,
                 qlcnic_pf_set_interface_id_create_tx_ctx(adapter, &temp);
 
         cmd.req.arg[1] = QLCNIC_CAP0_LEGACY_CONTEXT;
-        cmd.req.arg[5] = QLCNIC_MAX_TX_QUEUES | temp;
+        cmd.req.arg[5] = QLCNIC_SINGLE_RING | temp;
+
         buf = &cmd.req.arg[6];
         memcpy(buf, &mbx, sizeof(struct qlcnic_tx_mbx));
         /* send the mailbox command*/
@@ -1286,7 +1284,7 @@ int qlcnic_83xx_create_tx_ctx(struct qlcnic_adapter *adapter,
         tx->ctx_id = mbx_out->ctx_id;
         if ((adapter->flags & QLCNIC_MSIX_ENABLED) &&
             !(adapter->flags & QLCNIC_TX_INTR_SHARED)) {
-                intr_mask = ahw->intr_tbl[adapter->max_sds_rings + ring].src;
+                intr_mask = ahw->intr_tbl[adapter->drv_sds_rings + ring].src;
                 tx->crb_intr_mask = ahw->pci_base0 + intr_mask;
         }
         dev_info(&adapter->pdev->dev, "Tx Context[0x%x] Created, state:0x%x\n",
@@ -1297,7 +1295,7 @@ out:
 }
 
 static int qlcnic_83xx_diag_alloc_res(struct net_device *netdev, int test,
-                                      int num_sds_ring)
+                                      u8 num_sds_ring)
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         struct qlcnic_host_sds_ring *sds_ring;
@@ -1313,7 +1311,7 @@ static int qlcnic_83xx_diag_alloc_res(struct net_device *netdev, int test,
 
         qlcnic_detach(adapter);
 
-        adapter->max_sds_rings = 1;
+        adapter->drv_sds_rings = QLCNIC_SINGLE_RING;
         adapter->ahw->diag_test = test;
         adapter->ahw->linkup = 0;
 
@@ -1327,7 +1325,7 @@ static int qlcnic_83xx_diag_alloc_res(struct net_device *netdev, int test,
         if (ret) {
                 qlcnic_detach(adapter);
                 if (adapter_state == QLCNIC_ADAPTER_UP_MAGIC) {
-                        adapter->max_sds_rings = num_sds_ring;
+                        adapter->drv_sds_rings = num_sds_ring;
                         qlcnic_attach(adapter);
                 }
                 netif_device_attach(netdev);
@@ -1340,7 +1338,7 @@ static int qlcnic_83xx_diag_alloc_res(struct net_device *netdev, int test,
         }
 
         if (adapter->ahw->diag_test == QLCNIC_INTERRUPT_TEST) {
-                for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+                for (ring = 0; ring < adapter->drv_sds_rings; ring++) {
                         sds_ring = &adapter->recv_ctx->sds_rings[ring];
                         qlcnic_83xx_enable_intr(adapter, sds_ring);
                 }
@@ -1361,7 +1359,7 @@ static int qlcnic_83xx_diag_alloc_res(struct net_device *netdev, int test,
 }
 
 static void qlcnic_83xx_diag_free_res(struct net_device *netdev,
-                                        int max_sds_rings)
+                                      u8 drv_sds_rings)
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         struct qlcnic_host_sds_ring *sds_ring;
@@ -1369,7 +1367,7 @@ static void qlcnic_83xx_diag_free_res(struct net_device *netdev,
 
         clear_bit(__QLCNIC_DEV_UP, &adapter->state);
         if (adapter->ahw->diag_test == QLCNIC_INTERRUPT_TEST) {
-                for (ring = 0; ring < adapter->max_sds_rings; ring++) {
+                for (ring = 0; ring < adapter->drv_sds_rings; ring++) {
                         sds_ring = &adapter->recv_ctx->sds_rings[ring];
                         qlcnic_83xx_disable_intr(adapter, sds_ring);
                         if (!(adapter->flags & QLCNIC_MSIX_ENABLED))
@@ -1393,7 +1391,7 @@ static void qlcnic_83xx_diag_free_res(struct net_device *netdev,
                 }
         }
         adapter->ahw->diag_test = 0;
-        adapter->max_sds_rings = max_sds_rings;
+        adapter->drv_sds_rings = drv_sds_rings;
 
         if (qlcnic_attach(adapter))
                 goto out;
@@ -1655,7 +1653,8 @@ int qlcnic_83xx_loopback_test(struct net_device *netdev, u8 mode)
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         struct qlcnic_hardware_context *ahw = adapter->ahw;
-        int ret = 0, loop = 0, max_sds_rings = adapter->max_sds_rings;
+        u8 drv_sds_rings = adapter->drv_sds_rings;
+        int ret = 0, loop = 0;
 
         if (ahw->op_mode == QLCNIC_NON_PRIV_FUNC) {
                 netdev_warn(netdev,
@@ -1677,7 +1676,7 @@ int qlcnic_83xx_loopback_test(struct net_device *netdev, u8 mode)
                     mode == QLCNIC_ILB_MODE ? "internal" : "external");
 
         ret = qlcnic_83xx_diag_alloc_res(netdev, QLCNIC_LOOPBACK_TEST,
-                                         max_sds_rings);
+                                         drv_sds_rings);
         if (ret)
                 goto fail_diag_alloc;
 
@@ -1715,10 +1714,10 @@ int qlcnic_83xx_loopback_test(struct net_device *netdev, u8 mode)
         qlcnic_83xx_clear_lb_mode(adapter, mode);
 
 free_diag_res:
-        qlcnic_83xx_diag_free_res(netdev, max_sds_rings);
+        qlcnic_83xx_diag_free_res(netdev, drv_sds_rings);
 
 fail_diag_alloc:
-        adapter->max_sds_rings = max_sds_rings;
+        adapter->drv_sds_rings = drv_sds_rings;
         qlcnic_release_diag_lock(adapter);
         return ret;
 }
@@ -3303,10 +3302,10 @@ int qlcnic_83xx_interrupt_test(struct net_device *netdev)
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         struct qlcnic_hardware_context *ahw = adapter->ahw;
         struct qlcnic_cmd_args cmd;
+        u8 val, drv_sds_rings = adapter->drv_sds_rings;
         u32 data;
         u16 intrpt_id, id;
-        u8 val;
-        int ret, max_sds_rings = adapter->max_sds_rings;
+        int ret;
 
         if (test_bit(__QLCNIC_RESETTING, &adapter->state)) {
                 netdev_info(netdev, "Device is resetting\n");
@@ -3319,7 +3318,7 @@ int qlcnic_83xx_interrupt_test(struct net_device *netdev)
         }
 
         ret = qlcnic_83xx_diag_alloc_res(netdev, QLCNIC_INTERRUPT_TEST,
-                                         max_sds_rings);
+                                         drv_sds_rings);
         if (ret)
                 goto fail_diag_irq;
 
@@ -3356,10 +3355,10 @@ int qlcnic_83xx_interrupt_test(struct net_device *netdev)
 
 done:
         qlcnic_free_mbx_args(&cmd);
-        qlcnic_83xx_diag_free_res(netdev, max_sds_rings);
+        qlcnic_83xx_diag_free_res(netdev, drv_sds_rings);
 
 fail_diag_irq:
-        adapter->max_sds_rings = max_sds_rings;
+        adapter->drv_sds_rings = drv_sds_rings;
         qlcnic_release_diag_lock(adapter);
         return ret;
 }
@@ -3513,7 +3512,7 @@ int qlcnic_83xx_resume(struct qlcnic_adapter *adapter)
         if (err)
                 return err;
 
-        if (ahw->nic_mode == QLC_83XX_VIRTUAL_NIC_MODE) {
+        if (ahw->nic_mode == QLCNIC_VNIC_MODE) {
                 if (ahw->op_mode == QLCNIC_MGMT_FUNC) {
                         qlcnic_83xx_set_vnic_opmode(adapter);
                 } else {