Commit 15159ec0 authored Aug 07, 2023 by Jian Shen Committed by Jakub Kicinski Aug 08, 2023

net: hns3: restore user pause configure when disable autoneg



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

Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Peiyang Wang <wangpeiyang1@huawei.com>
Signed-off-by: Jijie Shao <shaojijie@huawei.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Link: https://lore.kernel.org/r/20230807113452.474224-2-shaojijie@huawei.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent b6f79e82

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -10915,9 +10915,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
		@@ -245,6 +245,7 @@ int hclge_pfc_pause_en_cfg(struct hclge_dev *hdev, u8 tx_rx_bitmap,
		u8 pfc_bitmap);
		int hclge_mac_pause_en_cfg(struct hclge_dev *hdev, bool tx, bool rx);
		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);