net/ice: support Rx scatter AVX2 vector

[dpdk.git] / drivers / net / i40e / i40e_pf.c

diff --git a/drivers/net/i40e/i40e_pf.c b/drivers/net/i40e/i40e_pf.c
index d6e83e3..91be450 100644 (file)
--- a/drivers/net/i40e/i40e_pf.c
+++ b/drivers/net/i40e/i40e_pf.c
@@ -1250,11 +1250,12 @@ i40e_pf_host_process_cmd_request_queues(struct i40e_pf_vf *vf, uint8_t *msg)
 
        pf = vf->pf;
 
-       if (req_pairs <= 0) {
-               PMD_DRV_LOG(ERR,
-                           "VF %d tried to request %d queues. Ignoring.\n",
-                           vf->vf_idx,
-                           I40E_MAX_QP_NUM_PER_VF);
+       if (!rte_is_power_of_2(req_pairs))
+               req_pairs = i40e_align_floor(req_pairs) << 1;
+
+       if (req_pairs == 0) {
+               PMD_DRV_LOG(ERR, "VF %d tried to request 0 queues. Ignoring.\n",
+                           vf->vf_idx);
        } else if (req_pairs > I40E_MAX_QP_NUM_PER_VF) {
                PMD_DRV_LOG(ERR,
                            "VF %d tried to request more than %d queues.\n",
@@ -1262,12 +1263,14 @@ i40e_pf_host_process_cmd_request_queues(struct i40e_pf_vf *vf, uint8_t *msg)
                            I40E_MAX_QP_NUM_PER_VF);
                vfres->num_queue_pairs = I40E_MAX_QP_NUM_PER_VF;
        } else if (req_pairs > cur_pairs + pf->qp_pool.num_free) {
-               PMD_DRV_LOG(ERR,
-                           "VF %d requested %d more queues, but noly %d left\n",
-                           vf->vf_idx,
-                           req_pairs - cur_pairs,
-                           pf->qp_pool.num_free);
-               vfres->num_queue_pairs = pf->qp_pool.num_free + cur_pairs;
+               PMD_DRV_LOG(ERR, "VF %d requested %d queues (rounded to %d) "
+                       "but only %d available\n",
+                       vf->vf_idx,
+                       vfres->num_queue_pairs,
+                       req_pairs,
+                       cur_pairs + pf->qp_pool.num_free);
+               vfres->num_queue_pairs = i40e_align_floor(pf->qp_pool.num_free +
+                                                         cur_pairs);
        } else {
                i40e_vc_notify_vf_reset(vf);
                vf->vsi->nb_qps = req_pairs;