[net-next 01/13] ixgbe: Drop probe_vf and merge functionality into ixgbe_enable_sriov

STALE5191d SUPERSEDED: 2 (0M)

From: Jeff Kirsher <hidden>
Date: 2012-07-21 23:09:07
Subsystem: intel ethernet drivers, networking drivers, the rest · Maintainers: Tony Nguyen, Przemek Kitszel, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

Revision v1 of 227 in this series; 2 review trailers.

Revisions (227)

2011-01-22 v1
2011-01-28 v1
2011-01-28 v2 [diff vs current]
2011-01-28 v1
2011-02-08 v1
2011-02-08 v1
2011-02-11 v2 [diff vs current]
2011-02-17 v1
2011-02-24 v1
2011-03-02 v1
2011-03-03 v1
2011-03-08 v1
2011-03-11 v1
2011-03-12 v1
2011-09-16 v1
2011-09-17 v1
2011-09-17 v1
2011-09-23 v2 [diff vs current]
2011-09-30 v1
2011-10-05 v3 [diff vs current]
2011-10-06 v1
2011-10-07 v1
2011-10-08 v1
2011-10-11 v2 [diff vs current]
2011-10-13 v2 [diff vs current]
2011-10-14 v1
2011-10-16 v2 [diff vs current]
2011-10-17 v1
2011-10-17 v2 [diff vs current]
2011-10-18 v3 [diff vs current]
2011-10-21 v1
2011-11-16 v1
2011-12-03 v1
2011-12-05 v2 [diff vs current]
2011-12-23 v1
2012-01-03 v1
2012-01-03 v1
2012-01-05 v2 [diff vs current]
2012-01-19 v1
2012-01-26 v1
2012-01-27 v1
2012-02-07 v1
2012-02-08 v1
2012-02-09 v2 [diff vs current]
2012-02-09 v1
2012-02-10 v2 [diff vs current]
2012-02-11 v1
2012-02-13 v1
2012-02-24 v1
2012-02-25 v1
2012-03-01 v1
2012-03-03 v1
2012-03-03 v1
2012-03-03 v1
2012-03-13 v1
2012-03-14 v1
2012-03-17 v1
2012-03-19 v1
2012-03-28 v1
2012-04-03 v1
2012-04-03 v1
2012-04-14 v1
2012-04-14 v1
2012-04-17 v1
2012-04-25 v1
2012-04-27 v1
2012-04-30 v1
2012-05-01 v2 [diff vs current]
2012-05-01 v1
2012-05-02 v2 [diff vs current]
2012-05-03 v1
2012-05-04 v1
2012-05-04 v2 [diff vs current]
2012-05-05 v1
2012-05-10 v1
2012-05-11 v1
2012-05-12 v2 [diff vs current]
2012-05-12 v3 [diff vs current]
2012-05-17 v1
2012-05-17 v2 [diff vs current]
2012-06-06 v1
2012-06-09 v1
2012-06-14 v1
2012-06-20 v1
2012-06-20 v1
2012-07-11 v1
2012-07-14 v1
2012-07-17 v1
2012-07-18 v1
2012-07-18 v1
2012-07-20 v1
2012-07-20 v1
2012-07-21 v1 current
2012-08-21 v1
2012-08-23 v1
2012-08-31 v1
2012-09-05 v1
2012-09-05 v1
2012-09-17 v1
2012-09-17 v1
2012-09-19 v1
2012-09-20 v2 [diff vs current]
2012-09-22 v1
2012-09-24 v1
2012-10-03 v1
2012-10-09 v1
2012-10-19 v1
2012-10-20 v1
2012-10-23 v1
2012-10-23 v1
2012-10-26 v1
2012-10-27 v2 [diff vs current]
2012-10-30 v1
2012-11-01 v1
2012-11-13 v1
2012-11-15 v1
2012-11-21 v1
2012-11-22 v2 [diff vs current]
2012-11-28 v1
2012-12-01 v1
2012-12-07 v1
2013-01-11 v1
2013-01-16 v1
2013-01-16 v2 [diff vs current]
2013-01-17 v1
2013-01-18 v2 [diff vs current]
2013-01-19 v1
2013-01-23 v1
2013-01-28 v1
2013-02-08 v1
2013-03-05 v1
2013-03-07 v1
2013-03-08 v1
2013-03-26 v1
2013-03-27 v1
2013-03-28 v1
2013-04-04 v1
2013-04-12 v1
2013-04-18 v2 [diff vs current]
2013-04-18 v1
2013-04-20 v1
2013-04-25 v2 [diff vs current]
2013-04-26 v1
2013-05-21 v1
2013-06-14 v1
2013-06-26 v1
2013-07-28 v1
2013-07-29 v1
2013-07-31 v2 [diff vs current]
2013-08-21 v1
2013-08-22 v2 [diff vs current]
2013-08-23 v2 [diff vs current]
2013-08-28 v1
2013-08-29 v2 [diff vs current]
2013-08-30 v3 [diff vs current]
2013-09-04 v1
2013-09-04 v4 [diff vs current]
2013-09-06 v1
2013-09-06 v5 [diff vs current]
2013-09-06 v6 [diff vs current]
2013-09-11 v7 [diff vs current]
2013-09-13 v1
2013-09-24 v1
2013-09-27 v2 [diff vs current]
2013-10-01 v1
2013-10-10 v1
2013-10-18 v1
2013-10-22 v2 [diff vs current]
2013-10-24 v1
2013-10-29 v1
2013-11-01 v1
2013-11-19 v1
2013-11-28 v1
2013-11-30 v2 [diff vs current]
2013-12-06 v1
2013-12-07 v1
2013-12-10 v1
2013-12-12 v1
2013-12-16 v2 [diff vs current]
2013-12-18 v1
2013-12-18 v1
2013-12-19 v1
2013-12-20 v2 [diff vs current]
2013-12-20 v3 [diff vs current]
2013-12-28 v4 [diff vs current]
2014-01-01 v1
2014-01-02 v1
2014-01-03 v2 [diff vs current]
2014-01-04 v5 [diff vs current]
2014-01-05 v1
2014-01-06 v1
2014-01-07 v1
2014-01-08 v2 [diff vs current]
2014-01-09 v1
2014-01-10 v1
2014-01-10 v2 [diff vs current]
2014-01-11 v3 [diff vs current]
2014-03-06 v1
2014-03-07 v2 [diff vs current]
2014-03-08 v1
2014-03-12 v1
2014-03-13 v2 [diff vs current]
2014-03-14 v1
2014-03-14 v2 [diff vs current]
2014-03-17 v1
2014-03-19 v2 [diff vs current]
2014-03-20 v3 [diff vs current]
2014-03-20 v1
2014-03-21 v1
2014-03-26 v1
2014-03-28 v2 [diff vs current]
2014-03-31 v1
2014-04-11 v1
2014-04-19 v1
2014-04-22 v1
2014-04-23 v1
2014-04-24 v1
2014-04-25 v2 [diff vs current]
2014-04-28 v1
2014-05-05 v1
2014-05-14 v1
2014-05-21 v1
2014-05-23 v2 [diff vs current]
2014-05-27 v1
2014-05-29 v1
2014-06-03 v1
2014-06-04 v2 [diff vs current]

From: Alexander Duyck <redacted>

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 <redacted>
Tested-by: Phil Schmitt <redacted>
Tested-by: Sibai Li <redacted>
Signed-off-by: Jeff Kirsher <redacted>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c   |    3 +--
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c  |   33 +++++++-----------------
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c |   24 ++++++++++++-----
 3 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
index 38d1b65..3ff5aa8 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c

@@ -1061,8 +1061,7 @@ static void ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
 	}
 	adapter->flags &= ~IXGBE_FLAG_FDIR_HASH_CAPABLE;
 	adapter->atr_sample_rate = 0;
-	if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
-		ixgbe_disable_sriov(adapter);
+	ixgbe_disable_sriov(adapter);
 
 	adapter->ring_feature[RING_F_RSS].limit = 1;
 	ixgbe_set_num_queues(adapter);

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index f4e53c1..24f2b45 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

@@ -4490,6 +4490,12 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
 	hw->fc.send_xon = true;
 	hw->fc.disable_fc_autoneg = false;
 
+#ifdef CONFIG_PCI_IOV
+	/* assign number of SR-IOV VFs */
+	if (hw->mac.type != ixgbe_mac_82598EB)
+		adapter->num_vfs = (max_vfs > 63) ? 0 : max_vfs;
+
+#endif
 	/* enable itr by default in dynamic mode */
 	adapter->rx_itr_setting = 1;
 	adapter->tx_itr_setting = 1;

@@ -6942,26 +6948,6 @@ static const struct net_device_ops ixgbe_netdev_ops = {
 	.ndo_fdb_dump		= ixgbe_ndo_fdb_dump,
 };
 
-static void __devinit ixgbe_probe_vf(struct ixgbe_adapter *adapter,
-				     const struct ixgbe_info *ii)
-{
-#ifdef CONFIG_PCI_IOV
-	struct ixgbe_hw *hw = &adapter->hw;
-
-	if (hw->mac.type == ixgbe_mac_82598EB)
-		return;
-
-	/* 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 = (max_vfs > 63) ? 0 : max_vfs;
-	ixgbe_enable_sriov(adapter, ii);
-#endif /* CONFIG_PCI_IOV */
-}
-
 /**
  * ixgbe_wol_supported - Check whether device supports WoL
  * @hw: hw specific details

@@ -7206,8 +7192,10 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
 		goto err_sw_init;
 	}
 
-	ixgbe_probe_vf(adapter, ii);
+#ifdef CONFIG_PCI_IOV
+	ixgbe_enable_sriov(adapter, ii);
 
+#endif
 	netdev->features = NETIF_F_SG |
 			   NETIF_F_IP_CSUM |
 			   NETIF_F_IPV6_CSUM |

@@ -7411,8 +7399,7 @@ err_register:
 	ixgbe_release_hw_control(adapter);
 	ixgbe_clear_interrupt_scheme(adapter);
 err_sw_init:
-	if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
-		ixgbe_disable_sriov(adapter);
+	ixgbe_disable_sriov(adapter);
 	adapter->flags2 &= ~IXGBE_FLAG2_SEARCH_FOR_SFP;
 	iounmap(hw->hw_addr);
 err_ioremap:

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index a825d48..593fdd5 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);

-- 
1.7.10.4

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help