ixgbe: Drop probe_vf and merge functionality into ixgbe_enable_sriov

This is meant to fix a bug in which we were not checking for pre-existing
VFs if we were not setting the max_vfs value at driver load.  What happens
now is that we always call ixgbe_enable_sriov and this checks for
pre-existing VFs ore requested VFs prior to deciding on no SR-IOV.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 17 insertions, 7 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index a825d4808cd2..593fdd54f9ab 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -82,7 +82,6 @@ void ixgbe_enable_sriov(struct ixgbe_adapter *adapter,
                          const struct ixgbe_info *ii)
 {
         struct ixgbe_hw *hw = &adapter->hw;
-        int err = 0;
         int num_vf_macvlans, i;
         struct vf_macvlans *mv_list;
         int pre_existing_vfs = 0;
@@ -106,10 +105,21 @@ void ixgbe_enable_sriov(struct ixgbe_adapter *adapter,
                          "enabled for this device - Please reload all "
                          "VF drivers to avoid spoofed packet errors\n");
         } else {
+                int err;
+                /*
+                 * The 82599 supports up to 64 VFs per physical function
+                 * but this implementation limits allocation to 63 so that
+                 * basic networking resources are still available to the
+                 * physical function.  If the user requests greater thn
+                 * 63 VFs then it is an error - reset to default of zero.
+                 */
+                adapter->num_vfs = min_t(unsigned int, adapter->num_vfs, 63);
+
                 err = pci_enable_sriov(adapter->pdev, adapter->num_vfs);
                 if (err) {
                         e_err(probe, "Failed to enable PCI sriov: %d\n", err);
-                        goto err_novfs;
+                        adapter->num_vfs = 0;
+                        return;
                 }
         }
 
@@ -193,11 +203,7 @@ void ixgbe_enable_sriov(struct ixgbe_adapter *adapter,
         /* Oh oh */
         e_err(probe, "Unable to allocate memory for VF Data Storage - "
               "SRIOV disabled\n");
-        pci_disable_sriov(adapter->pdev);
-
-err_novfs:
-        adapter->flags &= ~IXGBE_FLAG_SRIOV_ENABLED;
-        adapter->num_vfs = 0;
+        ixgbe_disable_sriov(adapter);
 }
 #endif /* #ifdef CONFIG_PCI_IOV */
 
@@ -219,6 +225,10 @@ void ixgbe_disable_sriov(struct ixgbe_adapter *adapter)
         kfree(adapter->mv_list);
         adapter->mv_list = NULL;
 
+        /* if SR-IOV is already disabled then there is nothing to do */
+        if (!(adapter->flags & IXGBE_FLAG_SRIOV_ENABLED))
+                return;
+
 #ifdef CONFIG_PCI_IOV
         /* disable iov and allow time for transactions to clear */
         pci_disable_sriov(adapter->pdev);