Unverified Commit 0107d9c6 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2123 Backport some patch for HNS3 and revert some unnecessary patch 

Merge Pull Request from: @svishen 
 
This pull requests backport some patch for HNS3 and revert some unnecessary patch

issue:
https://gitee.com/openeuler/kernel/issues/I7YRUW 
 
Link:https://gitee.com/openeuler/kernel/pulls/2123

 

Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents d82aa0e6 86cdab10

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -7977,7 +7977,7 @@ F: drivers/misc/hisi_hikey_usb.c 
F:	Documentation/devicetree/bindings/misc/hisilicon-hikey-usb.yaml









HISILICON PMU DRIVER









M:	Shaokun Zhang <zhangshaokun@hisilicon.com>









M:	Yicong Yang <yangyicong@hisilicon.com>









M:	Qi Liu <liuqi115@huawei.com>









S:	Supported









W:	http://www.hisilicon.com








@@ -7994,7 +7994,7 @@ F:      Documentation/trace/hisi-ptt.rst







F:      drivers/hwtracing/ptt/

















HISILICON HNS3 PMU DRIVER









M:	Guangbin Huang <huangguangbin2@huawei.com>









M:	Jijie Shao <shaojijie@huawei.com>









S:	Supported









F:	Documentation/admin-guide/perf/hns3-pmu.rst









F:	drivers/perf/hisilicon/hns3_pmu.c
































drivers/net/ethernet/hisilicon/hns3/Makefile



+2
−2






























Original line number
Diff line number
Diff line







@@ -18,11 +18,11 @@ hns3-$(CONFIG_HNS3_DCB) += hns3_dcbnl.o

















obj-$(CONFIG_HNS3_HCLGEVF) += hclgevf.o



















hclgevf-objs = hns3vf/hclgevf_main.o hns3vf/hclgevf_mbx.o  hns3vf/hclgevf_devlink.o \









hclgevf-objs = hns3vf/hclgevf_main.o hns3vf/hclgevf_mbx.o  hns3vf/hclgevf_devlink.o hns3vf/hclgevf_regs.o \









		hns3_common/hclge_comm_cmd.o hns3_common/hclge_comm_rss.o hns3_common/hclge_comm_tqp_stats.o



















obj-$(CONFIG_HNS3_HCLGE) += hclge.o









hclge-objs = hns3pf/hclge_main.o hns3pf/hclge_mdio.o hns3pf/hclge_tm.o hns3pf/hclge_sysfs.o \









hclge-objs = hns3pf/hclge_main.o hns3pf/hclge_mdio.o hns3pf/hclge_tm.o hns3pf/hclge_sysfs.o hns3pf/hclge_regs.o \









		hns3pf/hclge_mbx.o hns3pf/hclge_err.o  hns3pf/hclge_debugfs.o hns3pf/hclge_ptp.o hns3pf/hclge_devlink.o \









		hns3_common/hclge_comm_cmd.o hns3_common/hclge_comm_rss.o hns3_common/hclge_comm_tqp_stats.o









hclge-objs += hns3pf/hclge_ext.o
































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



+6
−0






























Original line number
Diff line number
Diff line







@@ -72,6 +72,9 @@







#define HNAE3_DEV_SUPPORT_ROCE_DCB_BITS (BIT(HNAE3_DEV_SUPPORT_DCB_B) | \









		BIT(HNAE3_DEV_SUPPORT_ROCE_B))



















#define hnae3_dev_roh_supported(hdev) \









	hnae3_get_bit((hdev)->ae_dev->flag, HNAE3_ROH_CLIENT_INITED_B)



















#define hnae3_dev_roce_supported(hdev) \









	hnae3_get_bit((hdev)->ae_dev->flag, HNAE3_DEV_SUPPORT_ROCE_B)


















@@ -396,6 +399,7 @@ struct hnae3_dev_specs {







	u16 umv_size;









	u16 mc_mac_size;









	u32 mac_stats_num;









	u8 tnl_num;









};



















struct hnae3_client_ops {








@@ -832,6 +836,8 @@ struct hnae3_tc_info {







	u8 max_tc; /* Total number of TCs */









	u8 num_tc; /* Total number of enabled TCs */









	bool mqprio_active;









	bool dcb_ets_active;









	u64 max_rate[HNAE3_MAX_TC];     /* Unit Bps */









};



















#define HNAE3_MAX_DSCP			64
































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



+1
−0






























Original line number
Diff line number
Diff line







@@ -22,6 +22,7 @@ enum hnae3_event_type_custom {







	HNAE3_IMP_RESET_FAIL_CUSTOM,









	HNAE3_PPU_POISON_CUSTOM,









	HNAE3_IMP_RD_POISON_CUSTOM,









	HNAE3_ROCEE_AXI_RESP_CUSTOM,









	HNAE3_INVALID_EVENT_CUSTOM,









};










































drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -153,6 +153,7 @@ enum hclge_opcode_type {







	HCLGE_OPC_TM_INTERNAL_STS	= 0x0850,









	HCLGE_OPC_TM_INTERNAL_CNT	= 0x0851,









	HCLGE_OPC_TM_INTERNAL_STS_1	= 0x0852,









	HCLGE_OPC_TM_TC_RATE_LIMIT_CFG	= 0x0871,









	HCLGE_OPC_TM_FLUSH		= 0x0872,



















	/* Packet buffer allocate commands */