Commit 2d973d2a authored by Jian Shen's avatar Jian Shen Committed by Jiantao Xiao
Browse files

net: hns3: restore user pause configure when disable autoneg 

mainline inclusion
from mainline-v6.5-rc6
commit 15159ec0
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I7WQZ1
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=15159ec0c831b565820c2de05114ea1b4cf07681



----------------------------------------------------------------------

Restore the mac pause state to user configuration when autoneg is disabled

Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarPeiyang Wang <wangpeiyang1@huawei.com>
Signed-off-by: default avatarJijie Shao <shaojijie@huawei.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Link: https://lore.kernel.org/r/20230807113452.474224-2-shaojijie@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarJiantao Xiao <xiaojiantao1@h-partners.com>
parent 963efdb1

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+4 −1
Original line number Diff line number Diff line
@@ -11383,9 +11383,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);



	local_advertising = linkmode_adv_to_lcl_adv_t(phydev->advertising);



	if (phydev->pause)

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c

+1 −1
Original line number Diff line number Diff line
@@ -1553,7 +1553,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;

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ int hclge_mac_pause_en_cfg(struct hclge_dev *hdev, bool tx, bool rx); 
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);