3a8995b1ad
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>
76 lines
2.5 KiB
Diff
76 lines
2.5 KiB
Diff
From 30543af4bf517080e505ce6a99e2d0a3c9211445 Mon Sep 17 00:00:00 2001
|
|
From: Huisong Li <lihuisong@huawei.com>
|
|
Date: Sat, 15 May 2021 08:52:35 +0800
|
|
Subject: [PATCH 168/189] net/hns3: remove meaningless packet buffer rollback
|
|
|
|
Packet buffer allocation and hardware pause configuration fail normally
|
|
when a reset occurs. If the execution fails, rollback of the packet
|
|
buffer still fails. So this rollback is meaningless.
|
|
|
|
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 | 14 +++++---------
|
|
1 file changed, 5 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c
|
|
index 3efc2cd..1547942 100644
|
|
--- a/drivers/net/hns3/hns3_dcb.c
|
|
+++ b/drivers/net/hns3/hns3_dcb.c
|
|
@@ -1543,7 +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;
|
|
- int ret, status;
|
|
+ int ret;
|
|
|
|
if (pf->tx_sch_mode != HNS3_FLAG_TC_BASE_SCH_MODE &&
|
|
pf->tx_sch_mode != HNS3_FLAG_VNET_BASE_SCH_MODE)
|
|
@@ -1568,7 +1568,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
|
|
|
|
ret = hns3_buffer_alloc(hw);
|
|
if (ret)
|
|
- return ret;
|
|
+ goto buffer_alloc_fail;
|
|
|
|
hw->current_fc_status = HNS3_FC_STATUS_PFC;
|
|
hw->requested_fc_mode = HNS3_FC_FULL;
|
|
@@ -1594,10 +1594,9 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
|
|
pfc_setup_fail:
|
|
hw->requested_fc_mode = requested_fc_mode;
|
|
hw->current_fc_status = fc_status;
|
|
+
|
|
+buffer_alloc_fail:
|
|
hw->dcb_info.hw_pfc_map = hw_pfc_map;
|
|
- status = hns3_buffer_alloc(hw);
|
|
- if (status)
|
|
- hns3_err(hw, "recover packet buffer fail! status = %d", status);
|
|
|
|
return ret;
|
|
}
|
|
@@ -1801,7 +1800,7 @@ hns3_dcb_pfc_enable(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *pfc_conf)
|
|
uint8_t pfc_en = hw->dcb_info.pfc_en;
|
|
uint8_t priority = pfc_conf->priority;
|
|
uint16_t pause_time = pf->pause_time;
|
|
- int ret, status;
|
|
+ int ret;
|
|
|
|
pf->pause_time = pfc_conf->fc.pause_time;
|
|
hns3_get_fc_mode(hw, pfc_conf->fc.mode);
|
|
@@ -1831,9 +1830,6 @@ hns3_dcb_pfc_enable(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *pfc_conf)
|
|
pf->pause_time = pause_time;
|
|
hw->dcb_info.pfc_en = pfc_en;
|
|
hw->dcb_info.hw_pfc_map = hw_pfc_map;
|
|
- status = hns3_buffer_alloc(hw);
|
|
- if (status)
|
|
- hns3_err(hw, "recover packet buffer fail: %d", status);
|
|
|
|
return ret;
|
|
}
|
|
--
|
|
2.7.4
|
|
|