73 lines
3.0 KiB
Diff
73 lines
3.0 KiB
Diff
From 8831abda8b2f895ad4ee125bbd8cb3475ec37544 Mon Sep 17 00:00:00 2001
|
|
From: Peiyang Wang <wangpeiyang1@huawei.com>
|
|
Date: Mon, 29 May 2023 21:09:14 +0800
|
|
Subject: [PATCH 239/283] net: hns3: restore user pause configure when disable
|
|
autoneg
|
|
|
|
driver inclusion
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EN49
|
|
CVE: NA
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Restore the mac pause state to user configuration when autoneg is disabled
|
|
|
|
Fixes: 1770a7a3aeb2 ("net: hns3: add support to update flow control settings after autoneg")
|
|
Signed-off-by: Jian Shen <shenjian15@huawei.com>
|
|
Signed-off-by: Peiyang Wang <wangpeiyang1@huawei.com>
|
|
(cherry picked from commit ae9425ebb8bf32e4777c72eba778153c8d971c5d)
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
---
|
|
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 +++++-
|
|
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +-
|
|
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 1 +
|
|
3 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
index 87e5793cf13c..0f180546a4d2 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
@@ -10942,8 +10942,12 @@ int hclge_cfg_flowctrl(struct hclge_dev *hdev)
|
|
u32 rx_pause, tx_pause;
|
|
u8 flowctl;
|
|
|
|
- if (!phydev->link || !phydev->autoneg)
|
|
+ if (!phydev->link)
|
|
return 0;
|
|
+
|
|
+ if (!phydev->autoneg)
|
|
+ return hclge_mac_pause_setup_hw(hdev);
|
|
+
|
|
#ifdef HAS_LINK_MODE_OPS
|
|
local_advertising = linkmode_adv_to_lcl_adv_t(phydev->advertising);
|
|
#else
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
|
|
index a18b2d2e4bb4..ffb4edc08791 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
|
|
@@ -1406,7 +1406,7 @@ static int hclge_bp_setup_hw(struct hclge_dev *hdev, u8 tc)
|
|
return 0;
|
|
}
|
|
|
|
-static int hclge_mac_pause_setup_hw(struct hclge_dev *hdev)
|
|
+int hclge_mac_pause_setup_hw(struct hclge_dev *hdev)
|
|
{
|
|
bool tx_en, rx_en;
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h
|
|
index d9dae3e60b9b..225a537b8da3 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h
|
|
@@ -206,6 +206,7 @@ int hclge_pfc_pause_en_cfg(struct hclge_dev *hdev, u8 tx_rx_bitmap,
|
|
int hclge_pause_param_cfg(struct hclge_dev *hdev, const u8 *addr,
|
|
u8 pause_trans_gap, u16 pause_trans_time);
|
|
int hclge_pause_addr_cfg(struct hclge_dev *hdev, const u8 *mac_addr);
|
|
+int hclge_mac_pause_setup_hw(struct hclge_dev *hdev);
|
|
void hclge_pfc_rx_stats_get(struct hclge_dev *hdev, u64 *stats);
|
|
void hclge_pfc_tx_stats_get(struct hclge_dev *hdev, u64 *stats);
|
|
int hclge_tm_qs_shaper_cfg(struct hclge_vport *vport, int max_tx_rate);
|
|
--
|
|
2.34.1
|
|
|