Commit 9e357eaf authored by Jijie Shao's avatar Jijie Shao Committed by Jiantao Xiao
Browse files

net: hns3: fix sending pfc frames after reset issue 

mainline inclusion
from mainline-v6.4-rc3
commit f14db070
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7S5M4
CVE: NA

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



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

To prevent the system from abnormally sending PFC frames after an
abnormal reset. The hns3 driver notifies the firmware to disable pfc
before reset.

Fixes: 35d93a30 ("net: hns3: adjust the process of PF reset")
Signed-off-by: default avatarJijie Shao <shaojijie@huawei.com>
Signed-off-by: default avatarHao Lan <lanhao@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarJiantao Xiao <xiaojiantao1@h-partners.com>
parent 510e3024

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

+9 −6
Original line number Diff line number Diff line
@@ -8486,13 +8486,16 @@ static void hclge_ae_stop(struct hnae3_handle *handle) 
	/* If it is not PF reset or FLR, the firmware will disable the MAC,

	 * so it only need to stop phy here.

	 */

	if (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state) &&

	    hdev->reset_type != HNAE3_FUNC_RESET &&

	if (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state)) {

		hclge_pfc_pause_en_cfg(hdev, HCLGE_PFC_TX_RX_DISABLE,

				       HCLGE_PFC_DISABLE);

		if (hdev->reset_type != HNAE3_FUNC_RESET &&

		    hdev->reset_type != HNAE3_FLR_RESET) {

			hclge_mac_stop_phy(hdev);

			hclge_update_link_status(hdev);

			return;

		}

	}



	hclge_reset_tqp(handle);

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

+2 −2
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ int hclge_mac_pause_en_cfg(struct hclge_dev *hdev, bool tx, bool rx) 
	return hclge_cmd_send(&hdev->hw, &desc, 1);

}



static int hclge_pfc_pause_en_cfg(struct hclge_dev *hdev, u8 tx_rx_bitmap,

int hclge_pfc_pause_en_cfg(struct hclge_dev *hdev, u8 tx_rx_bitmap,

			   u8 pfc_bitmap)

{

	struct hclge_desc desc;

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

+5 −0
Original line number Diff line number Diff line
@@ -167,6 +167,9 @@ struct hclge_bp_to_qs_map_cmd { 
	u32 rsvd1;

};



#define HCLGE_PFC_DISABLE	0

#define HCLGE_PFC_TX_RX_DISABLE	0



struct hclge_pfc_en_cmd {

	u8 tx_rx_en_bitmap;

	u8 pri_en_bitmap;
@@ -238,6 +241,8 @@ void hclge_tm_schd_info_update(struct hclge_dev *hdev, u8 num_tc); 
void hclge_tm_pfc_info_update(struct hclge_dev *hdev);

int hclge_tm_dwrr_cfg(struct hclge_dev *hdev);

int hclge_tm_init_hw(struct hclge_dev *hdev, bool init);

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_param_cfg(struct hclge_dev *hdev, const u8 *addr,

			  u8 pause_trans_gap, u16 pause_trans_time);