diff options
author | Amritha Nambiar <amritha.nambiar@intel.com> | 2017-11-08 19:38:43 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2017-11-22 02:34:05 -0500 |
commit | e56afa599609d3afe8b0ce24b553ab95e9782502 (patch) | |
tree | fb8c0fbd2a5a43df037d13ab7bbef70f7c4bf2fc /drivers | |
parent | 34c164de5867659f9162ae4fc9030b940bd40aaa (diff) |
i40e: Remove limit of 64 max queues per channel
It is safe to remove the upper limit of 64 queues on a channel
VSI. The upper bound is determined by the VSI's num_queue_pairs
and gets validated when the queue mapping info through mqprio
interface is subject to bound checking in the driver.
Signed-off-by: Amritha Nambiar <amritha.nambiar@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e.h | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h index 5829715fa342..e019baa905c5 100644 --- a/drivers/net/ethernet/intel/i40e/i40e.h +++ b/drivers/net/ethernet/intel/i40e/i40e.h | |||
@@ -90,7 +90,6 @@ | |||
90 | #define I40E_AQ_LEN 256 | 90 | #define I40E_AQ_LEN 256 |
91 | #define I40E_AQ_WORK_LIMIT 66 /* max number of VFs + a little */ | 91 | #define I40E_AQ_WORK_LIMIT 66 /* max number of VFs + a little */ |
92 | #define I40E_MAX_USER_PRIORITY 8 | 92 | #define I40E_MAX_USER_PRIORITY 8 |
93 | #define I40E_MAX_QUEUES_PER_CH 64 | ||
94 | #define I40E_DEFAULT_TRAFFIC_CLASS BIT(0) | 93 | #define I40E_DEFAULT_TRAFFIC_CLASS BIT(0) |
95 | #define I40E_DEFAULT_MSG_ENABLE 4 | 94 | #define I40E_DEFAULT_MSG_ENABLE 4 |
96 | #define I40E_QUEUE_WAIT_RETRY_LIMIT 10 | 95 | #define I40E_QUEUE_WAIT_RETRY_LIMIT 10 |
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 4a964d6e4a9e..173e924d4dae 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c | |||
@@ -5629,14 +5629,6 @@ static int i40e_validate_num_queues(struct i40e_pf *pf, int num_queues, | |||
5629 | return -EINVAL; | 5629 | return -EINVAL; |
5630 | 5630 | ||
5631 | *reconfig_rss = false; | 5631 | *reconfig_rss = false; |
5632 | |||
5633 | if (num_queues > I40E_MAX_QUEUES_PER_CH) { | ||
5634 | dev_err(&pf->pdev->dev, | ||
5635 | "Failed to create VMDq VSI. User requested num_queues (%d) > I40E_MAX_QUEUES_PER_VSI (%u)\n", | ||
5636 | num_queues, I40E_MAX_QUEUES_PER_CH); | ||
5637 | return -EINVAL; | ||
5638 | } | ||
5639 | |||
5640 | if (vsi->current_rss_size) { | 5632 | if (vsi->current_rss_size) { |
5641 | if (num_queues > vsi->current_rss_size) { | 5633 | if (num_queues > vsi->current_rss_size) { |
5642 | dev_dbg(&pf->pdev->dev, | 5634 | dev_dbg(&pf->pdev->dev, |