|
@@ -6933,17 +6933,17 @@ static int i40e_init_msix(struct i40e_pf *pf)
|
|
|
if (pf->flags & I40E_FLAG_FD_SB_ENABLED)
|
|
if (pf->flags & I40E_FLAG_FD_SB_ENABLED)
|
|
|
other_vecs++;
|
|
other_vecs++;
|
|
|
|
|
|
|
|
|
|
+ /* Scale down if necessary, and the rings will share vectors */
|
|
|
|
|
+ pf->num_lan_msix = min_t(int, pf->num_lan_msix,
|
|
|
|
|
+ (hw->func_caps.num_msix_vectors - other_vecs));
|
|
|
|
|
+ v_budget = pf->num_lan_msix + other_vecs;
|
|
|
|
|
+
|
|
|
#ifdef I40E_FCOE
|
|
#ifdef I40E_FCOE
|
|
|
if (pf->flags & I40E_FLAG_FCOE_ENABLED) {
|
|
if (pf->flags & I40E_FLAG_FCOE_ENABLED) {
|
|
|
pf->num_fcoe_msix = pf->num_fcoe_qps;
|
|
pf->num_fcoe_msix = pf->num_fcoe_qps;
|
|
|
v_budget += pf->num_fcoe_msix;
|
|
v_budget += pf->num_fcoe_msix;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
#endif
|
|
#endif
|
|
|
- /* Scale down if necessary, and the rings will share vectors */
|
|
|
|
|
- pf->num_lan_msix = min_t(int, pf->num_lan_msix,
|
|
|
|
|
- (hw->func_caps.num_msix_vectors - other_vecs));
|
|
|
|
|
- v_budget = pf->num_lan_msix + other_vecs;
|
|
|
|
|
|
|
|
|
|
pf->msix_entries = kcalloc(v_budget, sizeof(struct msix_entry),
|
|
pf->msix_entries = kcalloc(v_budget, sizeof(struct msix_entry),
|
|
|
GFP_KERNEL);
|
|
GFP_KERNEL);
|