net/hns3: fix status after repeated resets

Currently, when performing the following test case:
1. Run testpmd application based on hns3 PF device.
2. Inject reset(global/IMP reset) repeatedly.
After the reset, the network port can't link up.

In the RESET_STAGE_DEV_INIT stage of the reset process, the driver will
reinitialize the hardware. If global/IMP reset occurs at this time
again, the operation of reinitialize the hardware will fail because that
firmware don't respond to the configuration commands issued by driver.
In current driver, when failed to reinitialize the hardware, rollback
operation is done, such as clearing the relevant configuration of the
command queue registers.

If firmware detects that the function's command queue register is not
configured correctly, it will not complete the reset related hardware
configuration for this function, resulting in that driver can't detect
that the hardware reset has been completed. And then the reset process
of the driver exit abnormally, the hardware can not work normally after
reset.

This patch fixes it by avoid clearing the command queue related
registers when failed to reinitialize the hardware in the
RESET_STAGE_DEV_INIT stage of the reset process.

Fixes: 2790c6464725 ("net/hns3: support device reset")
Cc: stable@dpdk.org
Signed-off-by: Hongbo Zheng <zhenghongbo3@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
Signed-off-by: Chunsong Feng <fengchunsong@huawei.com>

diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c
index c85168b31930a0fed9648b60dde6af266e2fbbd6..c7993634e35c271d1bac90fe6f00a8eff825ecba 100644 (file)
--- a/drivers/net/hns3/hns3_cmd.c
+++ b/drivers/net/hns3/hns3_cmd.c
@@ -529,7 +529,7 @@ hns3_cmd_init(struct hns3_hw *hw)
        return 0;
 
 err_cmd_init:
-       hns3_cmd_uninit(hw);
+       rte_atomic16_set(&hw->reset.disable_cmd, 1);
        return ret;
 }
 

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index a7153545735f63274b963dbf54e2edd02cd8439c..94e8b8ab98d46ad86a1cf29aa46f181040c2b859 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -4126,13 +4126,10 @@ err_get_config:
        rte_intr_disable(&pci_dev->intr_handle);
        hns3_intr_unregister(&pci_dev->intr_handle, hns3_interrupt_handler,
                             eth_dev);
-
 err_intr_callback_register:
-       hns3_cmd_uninit(hw);
-
 err_cmd_init:
+       hns3_cmd_uninit(hw);
        hns3_cmd_destroy_queue(hw);
-
 err_cmd_init_queue:
        hw->io_base = NULL;
 
@@ -4610,31 +4607,24 @@ hns3_reinit_dev(struct hns3_adapter *hns)
        ret = hns3_reset_all_queues(hns);
        if (ret) {
                hns3_err(hw, "Failed to reset all queues: %d", ret);
-               goto err_init;
+               return ret;
        }
 
        ret = hns3_init_hardware(hns);
        if (ret) {
                hns3_err(hw, "Failed to init hardware: %d", ret);
-               goto err_init;
+               return ret;
        }
 
        ret = hns3_enable_hw_error_intr(hns, true);
        if (ret) {
                hns3_err(hw, "fail to enable hw error interrupts: %d",
                             ret);
-               goto err_mac_init;
+               return ret;
        }
        hns3_info(hw, "Reset done, driver initialization finished.");
 
        return 0;
-
-err_mac_init:
-       hns3_uninit_umv_space(hw);
-err_init:
-       hns3_cmd_uninit(hw);
-
-       return ret;
 }
 
 static bool

diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index febce865bdb9b13944b69407088e6ec8bbdd722d..e7e2cba82494c4baeb29f21a29af0c9d5f2a4e77 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1486,11 +1486,9 @@ err_get_config:
        hns3_intr_unregister(&pci_dev->intr_handle, hns3vf_interrupt_handler,
                             eth_dev);
 err_intr_callback_register:
-       hns3_cmd_uninit(hw);
-
 err_cmd_init:
+       hns3_cmd_uninit(hw);
        hns3_cmd_destroy_queue(hw);
-
 err_cmd_init_queue:
        hw->io_base = NULL;
 
@@ -2104,7 +2102,7 @@ hns3vf_reinit_dev(struct hns3_adapter *hns)
        ret = hns3_cmd_init(hw);
        if (ret) {
                hns3_err(hw, "Failed to init cmd: %d", ret);
-               goto err_cmd_init;
+               return ret;
        }
 
        if (hw->reset.level == HNS3_VF_FULL_RESET) {
@@ -2124,22 +2122,16 @@ hns3vf_reinit_dev(struct hns3_adapter *hns)
        ret = hns3_reset_all_queues(hns);
        if (ret) {
                hns3_err(hw, "Failed to reset all queues: %d", ret);
-               goto err_init;
+               return ret;
        }
 
        ret = hns3vf_init_hardware(hns);
        if (ret) {
                hns3_err(hw, "Failed to init hardware: %d", ret);
-               goto err_init;
+               return ret;
        }
 
        return 0;
-
-err_cmd_init:
-       hns3vf_set_bus_master(pci_dev, false);
-err_init:
-       hns3_cmd_uninit(hw);
-       return ret;
 }
 
 static const struct eth_dev_ops hns3vf_eth_dev_ops = {