net/iavf: improve default RSS

[dpdk.git] / drivers / net / iavf / iavf_vchnl.c

diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index 54d9917..25d5cda 100644 (file)
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -644,12 +644,12 @@ iavf_enable_queues_lv(struct iavf_adapter *adapter)
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
        err = iavf_execute_vf_cmd(adapter, &args);
-       if (err) {
+       if (err)
                PMD_DRV_LOG(ERR,
                            "Failed to execute command of OP_ENABLE_QUEUES_V2");
-               return err;
-       }
-       return 0;
+
+       rte_free(queue_select);
+       return err;
 }
 
 int
@@ -688,12 +688,12 @@ iavf_disable_queues_lv(struct iavf_adapter *adapter)
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
        err = iavf_execute_vf_cmd(adapter, &args);
-       if (err) {
+       if (err)
                PMD_DRV_LOG(ERR,
                            "Failed to execute command of OP_DISABLE_QUEUES_V2");
-               return err;
-       }
-       return 0;
+
+       rte_free(queue_select);
+       return err;
 }
 
 int
@@ -737,6 +737,8 @@ iavf_switch_queue_lv(struct iavf_adapter *adapter, uint16_t qid,
        if (err)
                PMD_DRV_LOG(ERR, "Failed to execute command of %s",
                            on ? "OP_ENABLE_QUEUES_V2" : "OP_DISABLE_QUEUES_V2");
+
+       rte_free(queue_select);
        return err;
 }
 
@@ -833,42 +835,48 @@ iavf_configure_queues(struct iavf_adapter *adapter,
             i++, vc_qp++) {
                vc_qp->txq.vsi_id = vf->vsi_res->vsi_id;
                vc_qp->txq.queue_id = i;
-               /* Virtchnnl configure queues by pairs */
+
+               /* Virtchnnl configure tx queues by pairs */
                if (i < adapter->eth_dev->data->nb_tx_queues) {
                        vc_qp->txq.ring_len = txq[i]->nb_tx_desc;
                        vc_qp->txq.dma_ring_addr = txq[i]->tx_ring_phys_addr;
                }
+
                vc_qp->rxq.vsi_id = vf->vsi_res->vsi_id;
                vc_qp->rxq.queue_id = i;
                vc_qp->rxq.max_pkt_size = vf->max_pkt_len;
-               /* Virtchnnl configure queues by pairs */
-               if (i < adapter->eth_dev->data->nb_rx_queues) {
-                       vc_qp->rxq.ring_len = rxq[i]->nb_rx_desc;
-                       vc_qp->rxq.dma_ring_addr = rxq[i]->rx_ring_phys_addr;
-                       vc_qp->rxq.databuffer_size = rxq[i]->rx_buf_len;
-               }
+
+               if (i >= adapter->eth_dev->data->nb_rx_queues)
+                       continue;
+
+               /* Virtchnnl configure rx queues by pairs */
+               vc_qp->rxq.ring_len = rxq[i]->nb_rx_desc;
+               vc_qp->rxq.dma_ring_addr = rxq[i]->rx_ring_phys_addr;
+               vc_qp->rxq.databuffer_size = rxq[i]->rx_buf_len;
 
 #ifndef RTE_LIBRTE_IAVF_16BYTE_RX_DESC
                if (vf->vf_res->vf_cap_flags &
-                       VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC &&
-                       vf->supported_rxdid & BIT(IAVF_RXDID_COMMS_OVS_1)) {
-                       vc_qp->rxq.rxdid = IAVF_RXDID_COMMS_OVS_1;
-                       PMD_DRV_LOG(NOTICE, "request RXDID == %d in "
-                                       "Queue[%d]", vc_qp->rxq.rxdid, i);
+                   VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC &&
+                   vf->supported_rxdid & BIT(rxq[i]->rxdid)) {
+                       vc_qp->rxq.rxdid = rxq[i]->rxdid;
+                       PMD_DRV_LOG(NOTICE, "request RXDID[%d] in Queue[%d]",
+                                   vc_qp->rxq.rxdid, i);
                } else {
+                       PMD_DRV_LOG(NOTICE, "RXDID[%d] is not supported, "
+                                   "request default RXDID[%d] in Queue[%d]",
+                                   rxq[i]->rxdid, IAVF_RXDID_LEGACY_1, i);
                        vc_qp->rxq.rxdid = IAVF_RXDID_LEGACY_1;
-                       PMD_DRV_LOG(NOTICE, "request RXDID == %d in "
-                                       "Queue[%d]", vc_qp->rxq.rxdid, i);
                }
 #else
                if (vf->vf_res->vf_cap_flags &
                        VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC &&
                        vf->supported_rxdid & BIT(IAVF_RXDID_LEGACY_0)) {
                        vc_qp->rxq.rxdid = IAVF_RXDID_LEGACY_0;
-                       PMD_DRV_LOG(NOTICE, "request RXDID == %d in "
-                                       "Queue[%d]", vc_qp->rxq.rxdid, i);
+                       PMD_DRV_LOG(NOTICE, "request RXDID[%d] in Queue[%d]",
+                                   vc_qp->rxq.rxdid, i);
                } else {
-                       PMD_DRV_LOG(ERR, "RXDID == 0 is not supported");
+                       PMD_DRV_LOG(ERR, "RXDID[%d] is not supported",
+                                   IAVF_RXDID_LEGACY_0);
                        return -1;
                }
 #endif
@@ -1335,6 +1343,29 @@ iavf_add_del_rss_cfg(struct iavf_adapter *adapter,
        return err;
 }
 
+int
+iavf_set_hena(struct iavf_adapter *adapter, uint64_t hena)
+{
+       struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
+       struct virtchnl_rss_hena vrh;
+       struct iavf_cmd_info args;
+       int err;
+
+       vrh.hena = hena;
+       args.ops = VIRTCHNL_OP_SET_RSS_HENA;
+       args.in_args = (u8 *)&vrh;
+       args.in_args_size = sizeof(vrh);
+       args.out_buffer = vf->aq_resp;
+       args.out_size = IAVF_AQ_BUF_SZ;
+
+       err = iavf_execute_vf_cmd(adapter, &args);
+       if (err)
+               PMD_DRV_LOG(ERR,
+                           "Failed to execute command of OP_SET_RSS_HENA");
+
+       return err;
+}
+
 int
 iavf_add_del_mc_addr_list(struct iavf_adapter *adapter,
                        struct rte_ether_addr *mc_addrs,