qlcnic: Enable diagnostic test for multiple Tx queues.

o Enable diagnostic test via ethtool and QConvergeConsole
  application when Multiple Tx queues are enabled on 82xx
  series adapters.

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

1 files changed, 9 insertions, 4 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
index f4b09f44173c..89f6dff76d52 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
@@ -130,7 +130,8 @@ struct sk_buff *qlcnic_process_rxbuf(struct qlcnic_adapter *,
 inline void qlcnic_enable_tx_intr(struct qlcnic_adapter *adapter,
                                   struct qlcnic_host_tx_ring *tx_ring)
 {
-        if (qlcnic_check_multi_tx(adapter))
+        if (qlcnic_check_multi_tx(adapter) &&
+            !adapter->ahw->diag_test)
                 writel(0x0, tx_ring->crb_intr_mask);
 }
 
@@ -138,7 +139,8 @@ inline void qlcnic_enable_tx_intr(struct qlcnic_adapter *adapter,
 static inline void qlcnic_disable_tx_int(struct qlcnic_adapter *adapter,
                                          struct qlcnic_host_tx_ring *tx_ring)
 {
-        if (qlcnic_check_multi_tx(adapter))
+        if (qlcnic_check_multi_tx(adapter) &&
+            !adapter->ahw->diag_test)
                 writel(1, tx_ring->crb_intr_mask);
 }
 
@@ -1466,6 +1468,7 @@ int qlcnic_82xx_napi_add(struct qlcnic_adapter *adapter,
         for (ring = 0; ring < adapter->max_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)) {
                         netif_napi_add(netdev, &sds_ring->napi, qlcnic_rx_poll,
                                         QLCNIC_NETDEV_WEIGHT * 2);
@@ -1487,7 +1490,7 @@ int qlcnic_82xx_napi_add(struct qlcnic_adapter *adapter,
                 return -ENOMEM;
         }
 
-        if (qlcnic_check_multi_tx(adapter)) {
+        if (qlcnic_check_multi_tx(adapter) && !adapter->ahw->diag_test) {
                 for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
                         tx_ring = &adapter->tx_ring[ring];
                         netif_napi_add(netdev, &tx_ring->napi, qlcnic_tx_poll,
@@ -1512,7 +1515,7 @@ void qlcnic_82xx_napi_del(struct qlcnic_adapter *adapter)
 
         qlcnic_free_sds_rings(adapter->recv_ctx);
 
-        if (qlcnic_check_multi_tx(adapter)) {
+        if (qlcnic_check_multi_tx(adapter) && !adapter->ahw->diag_test) {
                 for (ring = 0; ring < adapter->max_drv_tx_rings; ring++) {
                         tx_ring = &adapter->tx_ring[ring];
                         netif_napi_del(&tx_ring->napi);
@@ -1540,6 +1543,7 @@ 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++) {
                         tx_ring = &adapter->tx_ring[ring];
@@ -1567,6 +1571,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++) {
                         tx_ring = &adapter->tx_ring[ring];