net/iavf: fix default RSS configuration

[dpdk.git] / drivers / net / hns3 / hns3_ethdev_vf.c

diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 1af947a..0ee06bf 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1832,7 +1832,7 @@ hns3vf_init_vf(struct rte_eth_dev *eth_dev)
        if (ret)
                goto err_set_tc_queue;
 
-       hns3_set_default_rss_args(hw);
+       hns3_rss_set_default_args(hw);
 
        return 0;
 
@@ -1971,8 +1971,11 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
        struct hns3_hw *hw = &hns->hw;
        int ret = 0;
 
-       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+               rte_free(eth_dev->process_private);
+               eth_dev->process_private = NULL;
                return 0;
+       }
 
        if (hw->adapter_state == HNS3_NIC_STARTED)
                ret = hns3vf_dev_stop(eth_dev);
@@ -2085,21 +2088,22 @@ hns3vf_map_rx_interrupt(struct rte_eth_dev *dev)
        uint16_t q_id;
        int ret;
 
-       if (dev->data->dev_conf.intr_conf.rxq == 0)
+       /*
+        * hns3 needs a separate interrupt to be used as event interrupt which
+        * could not be shared with task queue pair, so KERNEL drivers need
+        * support multiple interrupt vectors.
+        */
+       if (dev->data->dev_conf.intr_conf.rxq == 0 ||
+           !rte_intr_cap_multiple(intr_handle))
                return 0;
 
-       /* disable uio/vfio intr/eventfd mapping */
        rte_intr_disable(intr_handle);
+       intr_vector = hw->used_rx_queues;
+       /* It creates event fd for each intr vector when MSIX is used */
+       if (rte_intr_efd_enable(intr_handle, intr_vector))
+               return -EINVAL;
 
-       /* check and configure queue intr-vector mapping */
-       if (rte_intr_cap_multiple(intr_handle) ||
-           !RTE_ETH_DEV_SRIOV(dev).active) {
-               intr_vector = hw->used_rx_queues;
-               /* It creates event fd for each intr vector when MSIX is used */
-               if (rte_intr_efd_enable(intr_handle, intr_vector))
-                       return -EINVAL;
-       }
-       if (rte_intr_dp_is_en(intr_handle) && !intr_handle->intr_vec) {
+       if (intr_handle->intr_vec == NULL) {
                intr_handle->intr_vec =
                        rte_zmalloc("intr_vec",
                                    hw->used_rx_queues * sizeof(int), 0);
@@ -2115,28 +2119,26 @@ hns3vf_map_rx_interrupt(struct rte_eth_dev *dev)
                vec = RTE_INTR_VEC_RXTX_OFFSET;
                base = RTE_INTR_VEC_RXTX_OFFSET;
        }
-       if (rte_intr_dp_is_en(intr_handle)) {
-               for (q_id = 0; q_id < hw->used_rx_queues; q_id++) {
-                       ret = hns3vf_bind_ring_with_vector(hw, vec, true,
-                                                          HNS3_RING_TYPE_RX,
-                                                          q_id);
-                       if (ret)
-                               goto vf_bind_vector_error;
-                       intr_handle->intr_vec[q_id] = vec;
-                       if (vec < base + intr_handle->nb_efd - 1)
-                               vec++;
-               }
+
+       for (q_id = 0; q_id < hw->used_rx_queues; q_id++) {
+               ret = hns3vf_bind_ring_with_vector(hw, vec, true,
+                                                  HNS3_RING_TYPE_RX, q_id);
+               if (ret)
+                       goto vf_bind_vector_error;
+               intr_handle->intr_vec[q_id] = vec;
+               /*
+                * If there are not enough efds (e.g. not enough interrupt),
+                * remaining queues will be bond to the last interrupt.
+                */
+               if (vec < base + intr_handle->nb_efd - 1)
+                       vec++;
        }
        rte_intr_enable(intr_handle);
        return 0;
 
 vf_bind_vector_error:
-       rte_intr_efd_disable(intr_handle);
-       if (intr_handle->intr_vec) {
-               free(intr_handle->intr_vec);
-               intr_handle->intr_vec = NULL;
-       }
-       return ret;
+       free(intr_handle->intr_vec);
+       intr_handle->intr_vec = NULL;
 vf_alloc_intr_vec_error:
        rte_intr_efd_disable(intr_handle);
        return ret;
@@ -2840,8 +2842,11 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev)
 
        PMD_INIT_FUNC_TRACE();
 
-       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-               return -EPERM;
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+               rte_free(eth_dev->process_private);
+               eth_dev->process_private = NULL;
+               return 0;
+       }
 
        if (hw->adapter_state < HNS3_NIC_CLOSING)
                hns3vf_dev_close(eth_dev);