Commit 1fdc2de7 authored by shaojijie's avatar shaojijie Committed by Jiantao Xiao
Browse files

net: hns3: support set pfc pause trans time 

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


CVE: NA

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

The patch provides a customized interface to modify the pause trans time
and retains the configured parameters.

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

drivers/net/ethernet/hisilicon/hns3/hnae3_ext.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ enum hnae3_ext_opcode { 
	HNAE3_EXT_OPC_DISABLE_LANE,

	HNAE3_EXT_OPC_GET_LANE_STATUS,

	HNAE3_EXT_OPC_DISABLE_CLOCK,

	HNAE3_EXT_OPC_SET_PFC_TIME,

};



struct hnae3_pfc_storm_para {

drivers/net/ethernet/hisilicon/hns3/hns3_ext.c

+7 −0
Original line number Diff line number Diff line
@@ -439,3 +439,10 @@ int nic_disable_clock(struct net_device *ndev) 
				  NULL, 0);

}

EXPORT_SYMBOL(nic_disable_clock);



int nic_set_pfc_time_cfg(struct net_device *ndev, u16 time)

{

	return nic_invoke_pri_ops(ndev, HNAE3_EXT_OPC_SET_PFC_TIME,

				  &time, sizeof(time));

}

EXPORT_SYMBOL(nic_set_pfc_time_cfg);

drivers/net/ethernet/hisilicon/hns3/hns3_ext.h

+1 −0
Original line number Diff line number Diff line
@@ -42,4 +42,5 @@ int nic_set_sfp_state(struct net_device *ndev, bool en); 
int nic_disable_net_lane(struct net_device *ndev);

int nic_get_net_lane_status(struct net_device *ndev, u32 *status);

int nic_disable_clock(struct net_device *ndev);

int nic_set_pfc_time_cfg(struct net_device *ndev, u16 time);

#endif

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

+38 −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;
@@ -550,6 +551,42 @@ static int hclge_disable_nic_clock(struct hclge_dev *hdev, void *data, 
	return ret;

}



static int hclge_set_pause_trans_time(struct hclge_dev *hdev, void *data,

				      size_t length)

{

	struct hclge_cfg_pause_param_cmd *pause_param;

	struct hclge_desc desc;

	u16 pause_trans_time;

	int ret;



	if (length != sizeof(u16))

		return -EINVAL;



	pause_param = (struct hclge_cfg_pause_param_cmd *)desc.data;

	ret = hclge_get_info_from_cmd(hdev, &desc, 1, HCLGE_OPC_CFG_MAC_PARA);

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to get pause cfg info, ret = %d\n", ret);

		return ret;

	}



	pause_trans_time = *(u16 *)data;

	if (pause_trans_time == le16_to_cpu(pause_param->pause_trans_time))

		return 0;



	ret = hclge_pause_param_cfg(hdev, pause_param->mac_addr,

				    pause_param->pause_trans_gap,

				    pause_trans_time);

	if (ret) {

		dev_err(&hdev->pdev->dev,

			"failed to set pause trans time, ret = %d\n", ret);

		return ret;

	}



	hdev->tm_info.pause_time = pause_trans_time;

	return 0;

}



static void hclge_ext_resotre_config(struct hclge_dev *hdev)

{

	if (hdev->reset_type != HNAE3_IMP_RESET &&
@@ -717,6 +754,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.h

+1 −0
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ struct hclge_tm_info { 
	enum hclge_fc_mode fc_mode;

	u8 hw_pfc_map; /* Allow for packet drop or not on this TC */

	u8 pfc_en;	/* PFC enabled or not for user priority */

	u16 pause_time;

};



/* max number of mac statistics on each version */