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

!6005 [OLK-6.6]Add Yunsilicon eth driver and rdma driver 

Merge Pull Request from: @OGman 
 
The driver code for Yunsilicon's MetaConnect/MetaFusion series network cards, first submission in OLK-6.6. This includes Ethernet and IB drivers, with support for x86 and arm64 architectures.

https://gitee.com/openeuler/kernel/issues/I9FTNI 
 
Link:https://gitee.com/openeuler/kernel/pulls/6005

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Signed-off-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parents 361454a6 601fb01d

arch/arm64/configs/openeuler_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -3056,6 +3056,9 @@ CONFIG_SMSC9420=m 
# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_NET_VENDOR_TEHUTI is not set

# CONFIG_NET_VENDOR_TI is not set

CONFIG_NET_VENDOR_YUNSILICON=y

CONFIG_YUNSILICON_XSC_ETH=m

CONFIG_YUNSILICON_XSC_PCI=m

CONFIG_NET_VENDOR_VERTEXCOM=y

# CONFIG_MSE102X is not set

# CONFIG_NET_VENDOR_VIA is not set
@@ -6179,6 +6182,7 @@ CONFIG_MLX5_INFINIBAND=m 
# CONFIG_INFINIBAND_OCRDMA is not set

CONFIG_INFINIBAND_QEDR=m

CONFIG_HIROCE3=m

CONFIG_INFINIBAND_XSC=m

CONFIG_RDMA_RXE=m

# CONFIG_RDMA_SIW is not set

CONFIG_INFINIBAND_IPOIB=m

arch/x86/configs/openeuler_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -3052,6 +3052,9 @@ CONFIG_SFC_MCDI_LOGGING=y 
# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_NET_VENDOR_TEHUTI is not set

# CONFIG_NET_VENDOR_TI is not set

CONFIG_NET_VENDOR_YUNSILICON=y

CONFIG_YUNSILICON_XSC_ETH=m

CONFIG_YUNSILICON_XSC_PCI=m

CONFIG_NET_VENDOR_VERTEXCOM=y

# CONFIG_MSE102X is not set

# CONFIG_NET_VENDOR_VIA is not set
@@ -6851,6 +6854,7 @@ CONFIG_MLX5_INFINIBAND=m 
# CONFIG_INFINIBAND_MTHCA is not set

# CONFIG_INFINIBAND_OCRDMA is not set

CONFIG_INFINIBAND_QEDR=m

CONFIG_INFINIBAND_XSC=m

# CONFIG_INFINIBAND_QIB is not set

CONFIG_INFINIBAND_USNIC=m

CONFIG_INFINIBAND_VMWARE_PVRDMA=m

drivers/infiniband/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ source "drivers/infiniband/hw/qib/Kconfig" 
source "drivers/infiniband/hw/usnic/Kconfig"

source "drivers/infiniband/hw/vmw_pvrdma/Kconfig"

source "drivers/infiniband/hw/hiroce3/Kconfig"

source "drivers/infiniband/hw/xsc/Kconfig"

source "drivers/infiniband/sw/rdmavt/Kconfig"

endif # !UML

source "drivers/infiniband/sw/rxe/Kconfig"

drivers/infiniband/hw/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -16,3 +16,4 @@ obj-$(CONFIG_INFINIBAND_QEDR) += qedr/ 
obj-$(CONFIG_INFINIBAND_BNXT_RE)	+= bnxt_re/

obj-$(CONFIG_INFINIBAND_ERDMA)		+= erdma/

obj-$(CONFIG_HIROCE3)			+= hiroce3/

obj-$(CONFIG_INFINIBAND_XSC)		+= xsc/

drivers/infiniband/hw/xsc/Kconfig

0 → 100644
+12 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# Copyright (C) 2021 - 2023, Shanghai Yunsilicon Technology Co., Ltd.

# All rights reserved.



config INFINIBAND_XSC

	tristate "Yunsilicon XSC RDMA driver"

	default n

	depends on NETDEVICES && ETHERNET && PCI && INET

	depends on YUNSILICON_XSC_PCI && YUNSILICON_XSC_ETH

	help

	  This driver provides RDMA support for

	  Yunsilicon XSC devices.