6112eef767
Sync some patchs from upstreaming for hns3 pmd and modifies are as follow: 1. fix RTC time after reset 2. fix Rx ring mbuf leakage at reset process 3. fix uninitialized variable 4. modify the code that violates the coding standards (cherry picked from commit f98940e02a12dc752a60e786009ee44cb6b32132)
52 lines
1.4 KiB
Diff
52 lines
1.4 KiB
Diff
From 974c06500687f166870e57a998fcdbb82f5d3628 Mon Sep 17 00:00:00 2001
|
|
From: Huisong Li <lihuisong@huawei.com>
|
|
Date: Fri, 2 Jun 2023 19:41:56 +0800
|
|
Subject: net/hns3: fix RTC time after reset
|
|
|
|
[ upstream commit 0335c1f3c43a7da75fe5e2ab7bac0422cfad99e3 ]
|
|
|
|
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")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Huisong Li <lihuisong@huawei.com>
|
|
Signed-off-by: Dongdong Liu <liudongdong3@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 d6214415b7..cecf6929f7 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev.c
|
|
+++ b/drivers/net/hns3/hns3_ethdev.c
|
|
@@ -4416,6 +4416,12 @@ hns3_init_hardware(struct hns3_adapter *hns)
|
|
goto err_mac_init;
|
|
}
|
|
|
|
+ ret = hns3_ptp_init(hw);
|
|
+ if (ret) {
|
|
+ PMD_INIT_LOG(ERR, "Failed to init PTP, ret = %d", ret);
|
|
+ goto err_mac_init;
|
|
+ }
|
|
+
|
|
return 0;
|
|
|
|
err_mac_init:
|
|
@@ -4577,10 +4583,6 @@ hns3_init_pf(struct rte_eth_dev *eth_dev)
|
|
goto err_intr_callback_register;
|
|
}
|
|
|
|
- ret = hns3_ptp_init(hw);
|
|
- if (ret)
|
|
- goto err_get_config;
|
|
-
|
|
/* Enable interrupt */
|
|
rte_intr_enable(pci_dev->intr_handle);
|
|
hns3_pf_enable_irq0(hw);
|
|
--
|
|
2.23.0
|
|
|