diff options
| author | Hariprasad Shenai <hariprasad@chelsio.com> | 2014-08-06 15:40:59 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-07 00:47:16 +0400 |
| commit | 8e1e605902d07c0ce1c3331a8d0a12a6c9e5d7fb (patch) | |
| tree | 1daed2897c52636011b350769c5a89686bec0e84 /drivers/net | |
| parent | 140c55d4b59581680dc8963612bdc79d19f7bef6 (diff) | |
| download | linux-8e1e605902d07c0ce1c3331a8d0a12a6c9e5d7fb.tar.xz | |
cxgb4: Fix for SR-IOV VF initialization
Commit 35b1de5 ("rdma/cxgb4: Fixes cxgb4 probe failure in VM when PF is exposed
through PCI Passthrough") introduced a regression, where VF failed to
initialize for Physical function 0 to Physical Function 3. In the above
commit, we removed the code which used to enable sriov for PF0 to PF3. Now
adding it back to get sriov working.
V2:
Removed SRIOV loop for PF[0..3] to instantiate the VF's as per David Miller's
comment
Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index 4247356c16ff..1a162d21d8ac 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -6527,11 +6527,9 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) /* We control everything through one PF */ func = SOURCEPF_GET(readl(adapter->regs + PL_WHOAMI)); - if ((pdev->device == 0xa000 && func != 0) || - func != ent->driver_data) { + if (func != ent->driver_data) { pci_save_state(pdev); /* to restore SR-IOV later */ - err = 0; - goto out_unmap_bar0; + goto sriov; } adapter->pdev = pdev; @@ -6697,6 +6695,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (is_offload(adapter)) attach_ulds(adapter); +sriov: #ifdef CONFIG_PCI_IOV if (func < ARRAY_SIZE(num_vf) && num_vf[func] > 0) if (pci_enable_sriov(pdev, num_vf[func]) == 0) |