瀏覽代碼

i40e: Change firmware workaround

Remove a workaround that is no longer necessary and implement
a better understanding of what firmware is returning in the MSI-X
vector count.  This makes it so that the driver ends up with the
right amount of queues when using all available MSI-X vectors.

Change-ID: I34e60cc71dcfb1b5412f37df956fedcc49ade187
Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Jesse Brandeburg 11 年之前
父節點
當前提交
d0b1024925
共有 2 個文件被更改,包括 2 次插入7 次删除
  1. 0 1
      drivers/net/ethernet/intel/i40e/i40e.h
  2. 2 6
      drivers/net/ethernet/intel/i40e/i40e_main.c

+ 0 - 1
drivers/net/ethernet/intel/i40e/i40e.h

@@ -63,7 +63,6 @@
 #define I40E_BASE_VSI_SEID    512
 #define I40E_BASE_VSI_SEID    512
 #define I40E_BASE_VEB_SEID    288
 #define I40E_BASE_VEB_SEID    288
 #define I40E_MAX_VEB          16
 #define I40E_MAX_VEB          16
-#define I40E_MAX_NPAR_QPS     32
 
 
 #define I40E_MAX_NUM_DESCRIPTORS      4096
 #define I40E_MAX_NUM_DESCRIPTORS      4096
 #define I40E_MAX_REGISTER     0x800000
 #define I40E_MAX_REGISTER     0x800000

+ 2 - 6
drivers/net/ethernet/intel/i40e/i40e_main.c

@@ -4704,12 +4704,8 @@ static int i40e_get_capabilities(struct i40e_pf *pf)
 		}
 		}
 	} while (err);
 	} while (err);
 
 
-	if (pf->hw.revision_id == 0 && (pf->flags & I40E_FLAG_MFP_ENABLED)) {
-		pf->hw.func_caps.num_msix_vectors += 1;
-		pf->hw.func_caps.num_tx_qp =
-			min_t(int, pf->hw.func_caps.num_tx_qp,
-			      I40E_MAX_NPAR_QPS);
-	}
+	/* increment MSI-X count because current FW skips one */
+	pf->hw.func_caps.num_msix_vectors++;
 
 
 	if (pf->hw.debug_mask & I40E_DEBUG_USER)
 	if (pf->hw.debug_mask & I40E_DEBUG_USER)
 		dev_info(&pf->pdev->dev,
 		dev_info(&pf->pdev->dev,