Update DPDK version from 19.11 to 20.11 and also support hns3 PMD for Kunpeng 920 and Kunpeng 930. Signed-off-by: speech_white <humin29@huawei.com>
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 8e8b04c6f9586cef6a58b6825fee632ebce13c36 Mon Sep 17 00:00:00 2001
|
|
From: Huisong Li <lihuisong@huawei.com>
|
|
Date: Sat, 15 May 2021 08:52:37 +0800
|
|
Subject: [PATCH 170/189] net/hns3: fix DCB reconfiguration
|
|
|
|
Whether the enable bit of the pfc ("pfc_en") is changed or not is one of
|
|
the conditions for reconfiguring the DCB. Currently, pfc_en is not
|
|
rolled back when DCB configuration fails. This patch fixes it.
|
|
|
|
Fixes: 62e3ccc2b94c ("net/hns3: support flow control")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Huisong Li <lihuisong@huawei.com>
|
|
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_dcb.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c
|
|
index 624bf40..8778452 100644
|
|
--- a/drivers/net/hns3/hns3_dcb.c
|
|
+++ b/drivers/net/hns3/hns3_dcb.c
|
|
@@ -1543,6 +1543,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
|
|
enum hns3_fc_status fc_status = hw->current_fc_status;
|
|
enum hns3_fc_mode requested_fc_mode = hw->requested_fc_mode;
|
|
uint8_t hw_pfc_map = hw->dcb_info.hw_pfc_map;
|
|
+ uint8_t pfc_en = hw->dcb_info.pfc_en;
|
|
int ret;
|
|
|
|
if (pf->tx_sch_mode != HNS3_FLAG_TC_BASE_SCH_MODE &&
|
|
@@ -1596,6 +1597,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
|
|
hw->current_fc_status = fc_status;
|
|
|
|
buffer_alloc_fail:
|
|
+ hw->dcb_info.pfc_en = pfc_en;
|
|
hw->dcb_info.hw_pfc_map = hw_pfc_map;
|
|
|
|
return ret;
|
|
--
|
|
2.7.4
|
|
|