[dpdk-stable] patch 'net/hns3: fix status after repeated resets' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 7caa43cc2266a8110cb1a5ac876ad30f6d4990e6 Mon Sep 17 00:00:00 2001
From: "Wei Hu (Xavier)" <xavier.huwei at huawei.com>
Date: Tue, 17 Mar 2020 17:12:06 +0800
Subject: [PATCH] net/hns3: fix status after repeated resets

[ upstream commit 25d257facdbc79ef0f99ee3505f3a233e1bbfeac ]

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")

Signed-off-by: Hongbo Zheng <zhenghongbo3 at huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
Signed-off-by: Chunsong Feng <fengchunsong at huawei.com>
---
 drivers/net/hns3/hns3_cmd.c       |  2 +-
 drivers/net/hns3/hns3_ethdev.c    | 18 ++++--------------
 drivers/net/hns3/hns3_ethdev_vf.c | 16 ++++------------
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c
index c85168b319..c7993634e3 100644
--- 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 688227e0eb..7c4c2e42c0 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -3992,13 +3992,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;
 
@@ -4367,31 +4364,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 2c792b1761..2096ad6fcd 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1176,11 +1176,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;
 
@@ -1633,7 +1631,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) {
@@ -1653,22 +1651,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 = {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:44.919193988 +0100
+++ 0008-net-hns3-fix-status-after-repeated-resets.patch	2020-05-19 14:04:44.060645545 +0100
@@ -1,8 +1,10 @@
-From 25d257facdbc79ef0f99ee3505f3a233e1bbfeac Mon Sep 17 00:00:00 2001
+From 7caa43cc2266a8110cb1a5ac876ad30f6d4990e6 Mon Sep 17 00:00:00 2001
 From: "Wei Hu (Xavier)" <xavier.huwei at huawei.com>
 Date: Tue, 17 Mar 2020 17:12:06 +0800
 Subject: [PATCH] net/hns3: fix status after repeated resets
 
+[ upstream commit 25d257facdbc79ef0f99ee3505f3a233e1bbfeac ]
+
 Currently, when performing the following test case:
 1. Run testpmd application based on hns3 PF device.
 2. Inject reset(global/IMP reset) repeatedly.
@@ -28,7 +30,6 @@
 RESET_STAGE_DEV_INIT stage of the reset process.
 
 Fixes: 2790c6464725 ("net/hns3: support device reset")
-Cc: stable at dpdk.org
 
 Signed-off-by: Hongbo Zheng <zhenghongbo3 at huawei.com>
 Signed-off-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
@@ -53,10 +54,10 @@
  }
  
 diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
-index a715354573..94e8b8ab98 100644
+index 688227e0eb..7c4c2e42c0 100644
 --- a/drivers/net/hns3/hns3_ethdev.c
 +++ b/drivers/net/hns3/hns3_ethdev.c
-@@ -4126,13 +4126,10 @@ err_get_config:
+@@ -3992,13 +3992,10 @@ err_get_config:
  	rte_intr_disable(&pci_dev->intr_handle);
  	hns3_intr_unregister(&pci_dev->intr_handle, hns3_interrupt_handler,
  			     eth_dev);
@@ -71,7 +72,7 @@
  err_cmd_init_queue:
  	hw->io_base = NULL;
  
-@@ -4610,31 +4607,24 @@ hns3_reinit_dev(struct hns3_adapter *hns)
+@@ -4367,31 +4364,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);
@@ -107,10 +108,10 @@
  
  static bool
 diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
-index febce865bd..e7e2cba824 100644
+index 2c792b1761..2096ad6fcd 100644
 --- a/drivers/net/hns3/hns3_ethdev_vf.c
 +++ b/drivers/net/hns3/hns3_ethdev_vf.c
-@@ -1486,11 +1486,9 @@ err_get_config:
+@@ -1176,11 +1176,9 @@ err_get_config:
  	hns3_intr_unregister(&pci_dev->intr_handle, hns3vf_interrupt_handler,
  			     eth_dev);
  err_intr_callback_register:
@@ -123,7 +124,7 @@
  err_cmd_init_queue:
  	hw->io_base = NULL;
  
-@@ -2104,7 +2102,7 @@ hns3vf_reinit_dev(struct hns3_adapter *hns)
+@@ -1633,7 +1631,7 @@ hns3vf_reinit_dev(struct hns3_adapter *hns)
  	ret = hns3_cmd_init(hw);
  	if (ret) {
  		hns3_err(hw, "Failed to init cmd: %d", ret);
@@ -132,7 +133,7 @@
  	}
  
  	if (hw->reset.level == HNS3_VF_FULL_RESET) {
-@@ -2124,22 +2122,16 @@ hns3vf_reinit_dev(struct hns3_adapter *hns)
+@@ -1653,22 +1651,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);