UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

cxgb4vf: Use pci_enable_msix_range() instead of pci_enable_msix() 

As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() and pci_enable_msix_range()
interfaces.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Casey Leedom <leedom@chelsio.com>
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Gordeev 2014-02-18 11:08:01 +01:00 committed by David S. Miller
parent f6f273bfe1
commit bd66368940
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
View File

@ -2444,7 +2444,7 @@ static void reduce_ethqs(struct adapter *adapter, int n)
*/ */
static int enable_msix(struct adapter *adapter) static int enable_msix(struct adapter *adapter)
{ {
int i, err, want, need; int i, want, need, nqsets;
struct msix_entry entries[MSIX_ENTRIES]; struct msix_entry entries[MSIX_ENTRIES];
struct sge *s = &adapter->sge; struct sge *s = &adapter->sge;
@ -2460,11 +2460,12 @@ static int enable_msix(struct adapter *adapter)
*/ */
want = s->max_ethqsets + MSIX_EXTRAS; want = s->max_ethqsets + MSIX_EXTRAS;
need = adapter->params.nports + MSIX_EXTRAS; need = adapter->params.nports + MSIX_EXTRAS;
while ((err = pci_enable_msix(adapter->pdev, entries, want)) >= need)
want = err;
if (err == 0) { want = pci_enable_msix_range(adapter->pdev, entries, need, want);
int nqsets = want - MSIX_EXTRAS; if (want < 0)
return want;
nqsets = want - MSIX_EXTRAS;
if (nqsets < s->max_ethqsets) { if (nqsets < s->max_ethqsets) {
dev_warn(adapter->pdev_dev, "only enough MSI-X vectors" dev_warn(adapter->pdev_dev, "only enough MSI-X vectors"
" for %d Queue Sets\n", nqsets); " for %d Queue Sets\n", nqsets);
@ -2474,11 +2475,8 @@ static int enable_msix(struct adapter *adapter)
} }
for (i = 0; i < want; ++i) for (i = 0; i < want; ++i)
adapter->msix_info[i].vec = entries[i].vector; adapter->msix_info[i].vec = entries[i].vector;
} else if (err > 0) {
dev_info(adapter->pdev_dev, "only %d MSI-X vectors left," return 0;
" not using MSI-X\n", err);
}
return err;
} }
static const struct net_device_ops cxgb4vf_netdev_ops = { static const struct net_device_ops cxgb4vf_netdev_ops = {