net/hns3: clear residual flow rules on init

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

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index d3b4856..0add73d 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -4107,6 +4107,19 @@ hns3_init_hardware(struct hns3_adapter *hns)
                PMD_INIT_LOG(ERR, "Failed to config gro: %d", ret);
                goto err_mac_init;
        }
+
+       /*
+        * In the initialization clearing the all hardware mapping relationship
+        * configurations between queues and interrupt vectors is needed, so
+        * some error caused by the residual configurations, such as the
+        * unexpected interrupt, can be avoid.
+        */
+       ret = hns3_init_ring_with_vector(hw);
+       if (ret) {
+               PMD_INIT_LOG(ERR, "Failed to init ring intr vector: %d", ret);
+               goto err_mac_init;
+       }
+
        return 0;
 
 err_mac_init:
@@ -4185,16 +4198,6 @@ hns3_init_pf(struct rte_eth_dev *eth_dev)
                goto err_fdir;
        }
 
-       /*
-        * In the initialization clearing the all hardware mapping relationship
-        * configurations between queues and interrupt vectors is needed, so
-        * some error caused by the residual configurations, such as the
-        * unexpected interrupt, can be avoid.
-        */
-       ret = hns3_init_ring_with_vector(hw);
-       if (ret)
-               goto err_fdir;
-
        return 0;
 
 err_fdir:
@@ -4339,6 +4342,31 @@ alloc_intr_vec_error:
        return ret;
 }
 
+static int
+hns3_restore_rx_interrupt(struct hns3_hw *hw)
+{
+       struct rte_eth_dev *dev = &rte_eth_devices[hw->data->port_id];
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
+       struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
+       uint16_t q_id;
+       int ret;
+
+       if (dev->data->dev_conf.intr_conf.rxq == 0)
+               return 0;
+
+       if (rte_intr_dp_is_en(intr_handle)) {
+               for (q_id = 0; q_id < hw->used_rx_queues; q_id++) {
+                       ret = hns3_bind_ring_with_vector(hw,
+                                       intr_handle->intr_vec[q_id], true,
+                                       HNS3_RING_TYPE_RX, q_id);
+                       if (ret)
+                               return ret;
+               }
+       }
+
+       return 0;
+}
+
 static void
 hns3_restore_filter(struct rte_eth_dev *dev)
 {
@@ -4365,19 +4393,30 @@ hns3_dev_start(struct rte_eth_dev *dev)
                rte_spinlock_unlock(&hw->lock);
                return ret;
        }
+       ret = hns3_map_rx_interrupt(dev);
+       if (ret) {
+               hw->adapter_state = HNS3_NIC_CONFIGURED;
+               rte_spinlock_unlock(&hw->lock);
+               return ret;
+       }
 
        hw->adapter_state = HNS3_NIC_STARTED;
        rte_spinlock_unlock(&hw->lock);
 
-       ret = hns3_map_rx_interrupt(dev);
-       if (ret)
-               return ret;
        hns3_set_rxtx_function(dev);
        hns3_mp_req_start_rxtx(dev);
        rte_eal_alarm_set(HNS3_SERVICE_INTERVAL, hns3_service_handler, dev);
 
        hns3_restore_filter(dev);
 
+       /* Enable interrupt of all rx queues before enabling queues */
+       hns3_dev_all_rx_queue_intr_enable(hw, true);
+       /*
+        * When finished the initialization, enable queues to receive/transmit
+        * packets.
+        */
+       hns3_enable_all_queues(hw, true);
+
        hns3_info(hw, "hns3 dev start successful!");
        return 0;
 }
@@ -4458,12 +4497,12 @@ hns3_dev_stop(struct rte_eth_dev *dev)
        rte_spinlock_lock(&hw->lock);
        if (rte_atomic16_read(&hw->reset.resetting) == 0) {
                hns3_do_stop(hns);
+               hns3_unmap_rx_interrupt(dev);
                hns3_dev_release_mbufs(hns);
                hw->adapter_state = HNS3_NIC_CONFIGURED;
        }
        rte_eal_alarm_cancel(hns3_service_handler, dev);
        rte_spinlock_unlock(&hw->lock);
-       hns3_unmap_rx_interrupt(dev);
 }
 
 static void
@@ -4977,9 +5016,18 @@ hns3_start_service(struct hns3_adapter *hns)
        eth_dev = &rte_eth_devices[hw->data->port_id];
        hns3_set_rxtx_function(eth_dev);
        hns3_mp_req_start_rxtx(eth_dev);
-       if (hw->adapter_state == HNS3_NIC_STARTED)
+       if (hw->adapter_state == HNS3_NIC_STARTED) {
                hns3_service_handler(eth_dev);
 
+               /* Enable interrupt of all rx queues before enabling queues */
+               hns3_dev_all_rx_queue_intr_enable(hw, true);
+               /*
+                * When finished the initialization, enable queues to receive
+                * and transmit packets.
+                */
+               hns3_enable_all_queues(hw, true);
+       }
+
        return 0;
 }
 
@@ -5013,6 +5061,10 @@ hns3_restore_conf(struct hns3_adapter *hns)
        if (ret)
                goto err_promisc;
 
+       ret = hns3_restore_rx_interrupt(hw);
+       if (ret)
+               goto err_promisc;
+
        if (hns->hw.adapter_state == HNS3_NIC_STARTED) {
                ret = hns3_do_start(hns, false);
                if (ret)