ixgbe: set driver_max_VFs should be done before enabling SRIOV
authorethan.zhao <ethan.zhao@oracle.com>
Fri, 17 Jan 2014 03:41:05 +0000 (19:41 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 18 Jan 2014 02:37:31 +0000 (18:37 -0800)
commit 43dc4e01 Limit number of reported VFs to device
 specific value It doesn't work and always returns -EBUSY because VFs are
 already enabled.

ixgbe_enable_sriov()
        pci_enable_sriov()
                sriov_enable()
                {
                ... ..
                iov->ctrl |= PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE;
                pci_cfg_access_lock(dev);
                ... ...
                }

pci_sriov_set_totalvfs()
{
... ...
if (dev->sriov->ctrl & PCI_SRIOV_CTRL_VFE)
                return -EBUSY;
...
}

So should set driver_max_VFs with pci_sriov_set_totalvfs() before
enable VFs with ixgbe_enable_sriov().

V2: revised for net-next tree.

Signed-off-by: Ethan Zhao <ethan.kernel@gmail.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

index 3fd4d3f22478627a856e819dc61b50d43a12dd74..61d985c9330b57c0a5b2e2862dfb369f06faedf2 100644 (file)
@@ -8019,8 +8019,8 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* Mailbox */
        ixgbe_init_mbx_params_pf(hw);
        memcpy(&hw->mbx.ops, ii->mbx_ops, sizeof(hw->mbx.ops));
-       ixgbe_enable_sriov(adapter);
        pci_sriov_set_totalvfs(pdev, IXGBE_MAX_VFS_DRV_LIMIT);
+       ixgbe_enable_sriov(adapter);
 skip_sriov:
 
 #endif