i40e: limit sriov to partition 1 of NPAR configurations
authorShannon Nelson <shannon.nelson@intel.com>
Thu, 11 Dec 2014 07:06:34 +0000 (07:06 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 13 Jan 2015 19:48:20 +0000 (11:48 -0800)
Make sure we only allow SR/IOV on the master PF of a port in multifunction
mode.  This should be the case anyway based on the num_vfs configured in
the NVM, but this will help make sure there's no question.  If we're not
in multifunction mode the partition_id will always be 1.

Change-ID: I8b2592366fe6782f15301bde2ebd1d4da240109d
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Tested-by: Jim Young <james.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_main.c

index 80430b0cfeb75365209c394f958039fe4b138f65..f3b036d19b6bca9cafe4c3dc1503604a0213a528 100644 (file)
@@ -7319,7 +7319,7 @@ static int i40e_sw_init(struct i40e_pf *pf)
 
 #endif /* I40E_FCOE */
 #ifdef CONFIG_PCI_IOV
-       if (pf->hw.func_caps.num_vfs) {
+       if (pf->hw.func_caps.num_vfs && pf->hw.partition_id == 1) {
                pf->num_vf_qps = I40E_DEFAULT_QUEUES_PER_VF;
                pf->flags |= I40E_FLAG_SRIOV_ENABLED;
                pf->num_req_vfs = min_t(int,