iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qlcnic: Fix MSI-X initialization code

Browse Source 
Function qlcnic_setup_tss_rss_intr() might enter endless
loop in case pci_enable_msix() contiguously returns a
positive number of MSI-Xs that could have been allocated.
Besides, the function contains 'err = -EIO;' assignment
that never could be reached. This update fixes the
aforementioned issues.

Cc: Shahed Shaikh <shahed.shaikh@qlogic.com>
Cc: Dept-HSGLinuxNICDev@qlogic.com
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Acked-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Gordeev 2014-04-15 11:37:14 +02:00 committed by David S. Miller
parent 54d63f787b
commit 8564ae09e0
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
View File

@ -670,7 +670,7 @@ int qlcnic_setup_tss_rss_intr(struct qlcnic_adapter *adapter)
else else
num_msix += adapter->drv_tx_rings; num_msix += adapter->drv_tx_rings;
if (adapter->drv_rss_rings > 0) if (adapter->drv_rss_rings > 0)
num_msix += adapter->drv_rss_rings; num_msix += adapter->drv_rss_rings;
else else
num_msix += adapter->drv_sds_rings; num_msix += adapter->drv_sds_rings;
@ -686,19 +686,15 @@ int qlcnic_setup_tss_rss_intr(struct qlcnic_adapter *adapter)
return -ENOMEM; return -ENOMEM;
} }
restore:
for (vector = 0; vector < num_msix; vector++) for (vector = 0; vector < num_msix; vector++)
adapter->msix_entries[vector].entry = vector; adapter->msix_entries[vector].entry = vector;
restore:
err = pci_enable_msix(pdev, adapter->msix_entries, num_msix); err = pci_enable_msix(pdev, adapter->msix_entries, num_msix);
if (err == 0) { if (err > 0) {
adapter->ahw->num_msix = num_msix; if (!adapter->drv_tss_rings && !adapter->drv_rss_rings)
if (adapter->drv_tss_rings > 0) return -ENOSPC;
adapter->drv_tx_rings = adapter->drv_tss_rings;
if (adapter->drv_rss_rings > 0)
adapter->drv_sds_rings = adapter->drv_rss_rings;
} else {
netdev_info(adapter->netdev, netdev_info(adapter->netdev,
"Unable to allocate %d MSI-X vectors, Available vectors %d\n", "Unable to allocate %d MSI-X vectors, Available vectors %d\n",
num_msix, err); num_msix, err);
@ -716,12 +712,20 @@ restore:
"Restoring %d Tx, %d SDS rings for total %d vectors.\n", "Restoring %d Tx, %d SDS rings for total %d vectors.\n",
adapter->drv_tx_rings, adapter->drv_sds_rings, adapter->drv_tx_rings, adapter->drv_sds_rings,
num_msix); num_msix);
goto restore;
err = -EIO; goto restore;
} else if (err < 0) {
return err;
} }
return err; adapter->ahw->num_msix = num_msix;
if (adapter->drv_tss_rings > 0)
adapter->drv_tx_rings = adapter->drv_tss_rings;
if (adapter->drv_rss_rings > 0)
adapter->drv_sds_rings = adapter->drv_rss_rings;
return 0;
} }
int qlcnic_enable_msix(struct qlcnic_adapter *adapter, u32 num_msix) int qlcnic_enable_msix(struct qlcnic_adapter *adapter, u32 num_msix)