Commit 5a8b25e7 authored by Jiantao Xiao's avatar Jiantao Xiao
Browse files

Revert "net: hns3: support set pfc pause trans time" 

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


CVE: NA

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

This reverts commit d8f1cb18.

Signed-off-by: default avatarJiantao Xiao <xiaojiantao1@h-partners.com>
parent 2c7b3536

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

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 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,

	HNAE3_EXT_OPC_GET_HILINK_REF_LOS,

	HNAE3_EXT_OPC_GET_PORT_FAULT_STATUS,

	HNAE3_EXT_OPC_GET_PORT_TYPE,

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

+0 −7
Original line number Diff line number Diff line
@@ -442,13 +442,6 @@ int nic_disable_clock(struct net_device *ndev) 
}

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



int nic_get_port_fault_status(struct net_device *ndev, u32 fault_type, u32 *status)

{

	int opcode = HNAE3_EXT_OPC_GET_PORT_FAULT_STATUS;

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

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 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);

int nic_get_port_fault_status(struct net_device *ndev, u32 fault_type, u32 *status);

int nic_get_port_wire_type(struct net_device *ndev, u32 *wire_type);

int nic_set_mac_state(struct net_device *ndev, int enable);

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

+0 −36
Original line number Diff line number Diff line
@@ -545,42 +545,6 @@ 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 int hclge_get_hilink_ref_los(struct hclge_dev *hdev, void *data,

				    size_t length)

{

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

+0 −1
Original line number Diff line number Diff line
@@ -372,7 +372,6 @@ 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 */