cxgb4: Fix for SR-IOV VF initialization
authorHariprasad Shenai <hariprasad@chelsio.com>
Wed, 6 Aug 2014 11:40:59 +0000 (17:10 +0530)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Aug 2014 20:47:16 +0000 (13:47 -0700)
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>
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

index 4247356..1a162d2 100644 (file)
@@ -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)