Commit a34977ba authored by Anjali Singhai Jain's avatar Anjali Singhai Jain Committed by Jeff Kirsher

i40e: Changes to Interrupt distribution policy

This patch changes the way resources are distributed to special features.

Change-ID: I847e49d714a1d70e97f3f994cb39bfb5e02ab016
Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c674d125
...@@ -6228,6 +6228,16 @@ static int i40e_init_msix(struct i40e_pf *pf) ...@@ -6228,6 +6228,16 @@ static int i40e_init_msix(struct i40e_pf *pf)
for (i = 0; i < v_budget; i++) for (i = 0; i < v_budget; i++)
pf->msix_entries[i].entry = i; pf->msix_entries[i].entry = i;
vec = i40e_reserve_msix_vectors(pf, v_budget); vec = i40e_reserve_msix_vectors(pf, v_budget);
if (vec != v_budget) {
/* If we have limited resources, we will start with no vectors
* for the special features and then allocate vectors to some
* of these features based on the policy and at the end disable
* the features that did not get any vectors.
*/
pf->num_vmdq_msix = 0;
}
if (vec < I40E_MIN_MSIX) { if (vec < I40E_MIN_MSIX) {
pf->flags &= ~I40E_FLAG_MSIX_ENABLED; pf->flags &= ~I40E_FLAG_MSIX_ENABLED;
kfree(pf->msix_entries); kfree(pf->msix_entries);
...@@ -6236,27 +6246,25 @@ static int i40e_init_msix(struct i40e_pf *pf) ...@@ -6236,27 +6246,25 @@ static int i40e_init_msix(struct i40e_pf *pf)
} else if (vec == I40E_MIN_MSIX) { } else if (vec == I40E_MIN_MSIX) {
/* Adjust for minimal MSIX use */ /* Adjust for minimal MSIX use */
dev_info(&pf->pdev->dev, "Features disabled, not enough MSI-X vectors\n");
pf->flags &= ~I40E_FLAG_VMDQ_ENABLED;
pf->num_vmdq_vsis = 0; pf->num_vmdq_vsis = 0;
pf->num_vmdq_qps = 0; pf->num_vmdq_qps = 0;
pf->num_vmdq_msix = 0;
pf->num_lan_qps = 1; pf->num_lan_qps = 1;
pf->num_lan_msix = 1; pf->num_lan_msix = 1;
} else if (vec != v_budget) { } else if (vec != v_budget) {
/* reserve the misc vector */
vec--;
/* Scale vector usage down */ /* Scale vector usage down */
pf->num_vmdq_msix = 1; /* force VMDqs to only one vector */ pf->num_vmdq_msix = 1; /* force VMDqs to only one vector */
vec--; /* reserve the misc vector */ pf->num_vmdq_vsis = 1;
/* partition out the remaining vectors */ /* partition out the remaining vectors */
switch (vec) { switch (vec) {
case 2: case 2:
pf->num_vmdq_vsis = 1;
pf->num_lan_msix = 1; pf->num_lan_msix = 1;
break; break;
case 3: case 3:
pf->num_vmdq_vsis = 1;
pf->num_lan_msix = 2; pf->num_lan_msix = 2;
break; break;
default: default:
...@@ -6268,6 +6276,11 @@ static int i40e_init_msix(struct i40e_pf *pf) ...@@ -6268,6 +6276,11 @@ static int i40e_init_msix(struct i40e_pf *pf)
} }
} }
if ((pf->flags & I40E_FLAG_VMDQ_ENABLED) &&
(pf->num_vmdq_msix == 0)) {
dev_info(&pf->pdev->dev, "VMDq disabled, not enough MSI-X vectors\n");
pf->flags &= ~I40E_FLAG_VMDQ_ENABLED;
}
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment