patch 'net/hns3: fix RTC time after reset' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/25/23. 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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/d2ec3c302c63f80638445748a0b37d6b79e626b6

Thanks.

Kevin

---
>From d2ec3c302c63f80638445748a0b37d6b79e626b6 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Fri, 2 Jun 2023 19:41:56 +0800
Subject: [PATCH] net/hns3: fix RTC time after reset

[ upstream commit 14d9281d9c65afd743354737b8c70555161d4a69 ]

The enabled status of RTC time will be cleared after global
or IMP reset, which cause the local RTC time doesn't work.
So this patch fix it.

Fixes: 38b539d96eb6 ("net/hns3: support IEEE 1588 PTP")

Signed-off-by: Huisong Li <lihuisong at huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3 at huawei.com>
---
 drivers/net/hns3/hns3_ethdev.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index c70cf12b01..936426c117 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -4427,4 +4427,10 @@ hns3_init_hardware(struct hns3_adapter *hns)
 	}
 
+	ret = hns3_ptp_init(hw);
+	if (ret) {
+		PMD_INIT_LOG(ERR, "Failed to init PTP, ret = %d", ret);
+		goto err_mac_init;
+	}
+
 	return 0;
 
@@ -4606,8 +4612,4 @@ hns3_init_pf(struct rte_eth_dev *eth_dev)
 	}
 
-	ret = hns3_ptp_init(hw);
-	if (ret)
-		goto err_get_config;
-
 	/* Enable interrupt */
 	rte_intr_enable(pci_dev->intr_handle);
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-20 16:17:59.857189268 +0100
+++ 0039-net-hns3-fix-RTC-time-after-reset.patch	2023-07-20 16:17:54.627750369 +0100
@@ -1 +1 @@
-From 14d9281d9c65afd743354737b8c70555161d4a69 Mon Sep 17 00:00:00 2001
+From d2ec3c302c63f80638445748a0b37d6b79e626b6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 14d9281d9c65afd743354737b8c70555161d4a69 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 600accea93..9ed54ae384 100644
+index c70cf12b01..936426c117 100644
@@ -23 +24 @@
-@@ -4417,4 +4417,10 @@ hns3_init_hardware(struct hns3_adapter *hns)
+@@ -4427,4 +4427,10 @@ hns3_init_hardware(struct hns3_adapter *hns)
@@ -34 +35 @@
-@@ -4578,8 +4584,4 @@ hns3_init_pf(struct rte_eth_dev *eth_dev)
+@@ -4606,8 +4612,4 @@ hns3_init_pf(struct rte_eth_dev *eth_dev)