Commit 29e4bb1a authored by Jiantao Xiao's avatar Jiantao Xiao
Browse files

net: hns3: disbable pfc en before the reset 

driver inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I6W94W


CVE: NA

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

To prevent the system from abnormally sending PFC frames after an
abnormal reset. If the reset type is not imp reset or global reset,
the system notifies the firmware to disable pfc before the reset.

Signed-off-by: default avatarshaojijie <shaojijie@huawei.com>
Signed-off-by: default avatarJiantao Xiao <xiaojiantao1@h-partners.com>
parent d8f1cb18

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

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include "hnae3_ext.h"

#include "hclge_cmd.h"

#include "hclge_ext.h"

#include "hclge_tm.h"



static nic_event_fn_t nic_event_call;
@@ -747,6 +748,7 @@ static const hclge_priv_ops_fn hclge_ext_func_arr[] = { 
	[HNAE3_EXT_OPC_DISABLE_LANE] = hclge_disable_net_lane,

	[HNAE3_EXT_OPC_GET_LANE_STATUS] = hclge_get_net_lane_status,

	[HNAE3_EXT_OPC_DISABLE_CLOCK] = hclge_disable_nic_clock,

	[HNAE3_EXT_OPC_SET_PFC_TIME] = hclge_set_pause_trans_time,

};



int hclge_ext_ops_handle(struct hnae3_handle *handle, int opcode,

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

+9 −6
Original line number Diff line number Diff line
@@ -8465,13 +8465,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
@@ -164,6 +164,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;
@@ -236,6 +239,8 @@ 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_mac_pause_en_cfg(struct hclge_dev *hdev, bool tx, bool rx);

int hclge_pfc_pause_en_cfg(struct hclge_dev *hdev, u8 tx_rx_bitmap,

			   u8 pfc_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);