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

!2308 unic: add ub support to hns3 

Merge Pull Request from: @mufengyan 
 
drivers inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I850RQ


CVE: NA

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

1、Supports the Layer 2 network protocol UBLink.
2、The HNS3 driver supports the UB device. When the driver is loaded
based on the UB device, the driver enters the UB mode and has the
capability of sending and receiving UB packets.

Signed-off-by: default avatarJunxin Chen <chenjunxin1@huawei.com>
Signed-off-by: default avatarFengyan Mu <mufengyan@hisilicon.com>
Signed-off-by: default avatarHaibin Lu <luhaibin10@hisilicon.com>
 
Link:https://gitee.com/openeuler/kernel/pulls/2308

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Reviewed-by: default avatarLin Yunsheng <linyunsheng@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 13f42fc4 1620efa4

arch/arm64/configs/openeuler_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -2758,6 +2758,7 @@ CONFIG_HNS3_HCLGE=m 
CONFIG_HNS3_DCB=y

CONFIG_HNS3_HCLGEVF=m

CONFIG_HNS3_ENET=m

CONFIG_HNS3_UBL=y

CONFIG_NET_VENDOR_HUAWEI=y

CONFIG_HINIC=m

CONFIG_HINIC3=m
@@ -2904,6 +2905,7 @@ CONFIG_NET_VENDOR_NEBULA_MATRIX=y 
CONFIG_M1600=m

# CONFIG_FDDI is not set

# CONFIG_HIPPI is not set

CONFIG_UBL=y

# CONFIG_NET_SB1000 is not set

CONFIG_PHYLIB=y

CONFIG_SWPHY=y

drivers/net/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -444,6 +444,8 @@ source "drivers/net/fddi/Kconfig" 


source "drivers/net/hippi/Kconfig"



source "drivers/net/ub/Kconfig"



source "drivers/net/ipa/Kconfig"



config NET_SB1000

drivers/net/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ obj-$(CONFIG_WAN) += wan/ 
obj-$(CONFIG_WLAN) += wireless/

obj-$(CONFIG_WIMAX) += wimax/

obj-$(CONFIG_IEEE802154) += ieee802154/

obj-$(CONFIG_UBL) += ub/



obj-$(CONFIG_VMXNET3) += vmxnet3/

obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o

drivers/net/ethernet/hisilicon/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -139,6 +139,16 @@ config HNS3_ENET 
	  family of SoCs. This module depends upon HNAE3 driver to access the HNAE3

	  devices and their associated operations.



config HNS3_UBL

	bool "Hisilicon HNS3 UB Link Device Support"

	default n

	depends on UBL

	help

	  This selects the HNS UBL support which depends upon configuration UBL.

	  It is needed by Hisilicon Network Subsystem 3 to use the UB Link and

	  its associated operations.

	  Say N if using non-UB device and network.



endif #HNS3



endif # NET_VENDOR_HISILICON

drivers/net/ethernet/hisilicon/hns3/Makefile

+10 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#



ccflags-y += -I$(srctree)/$(src)

ccflags-y += -I$(srctree)/drivers/net/ub/dev

ccflags-y += -I$(srctree)/drivers/net/ethernet/hisilicon/hns3/hns3pf

ccflags-y += -I$(srctree)/drivers/net/ethernet/hisilicon/hns3/hns3vf

ccflags-y += -I$(srctree)/drivers/net/ethernet/hisilicon/hns3/hns3_common
@@ -15,16 +16,23 @@ hns3-objs = hns3_enet.o hns3_ethtool.o hns3_debugfs.o 
hns3-objs += hns3_ext.o



hns3-$(CONFIG_HNS3_DCB) += hns3_dcbnl.o

hns3-$(CONFIG_HNS3_UBL) += hns3_unic.o hns3_unic_debugfs.o



obj-$(CONFIG_HNS3_HCLGEVF) += hclgevf.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

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

		hns3vf/hclgevf_udma.o

hclgevf-$(CONFIG_HNS3_UBL) += hns3_common/hclge_comm_unic_addr.o hns3vf/hclgevf_unic_ip.o hns3vf/hclgevf_unic_guid.o \

				hns3vf/hclgevf_unic_addr.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 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

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

		hns3pf/hclge_udma.o

hclge-objs += hns3pf/hclge_ext.o



hclge-$(CONFIG_HNS3_UBL) += hns3_common/hclge_comm_unic_addr.o hns3pf/hclge_unic_ip.o hns3pf/hclge_unic_guid.o \

			hns3pf/hclge_unic_addr.o

hclge-$(CONFIG_HNS3_DCB) += hns3pf/hclge_dcb.o