Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions arch/arm64/configs/deepin_arm64_desktop_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -884,12 +884,15 @@ CONFIG_MTD_ONENAND_2X_PROGRAM=y
CONFIG_MTD_RAW_NAND=m
CONFIG_MTD_NAND_DENALI_PCI=m
CONFIG_MTD_NAND_DENALI_DT=m
CONFIG_MTD_NAND_OMAP2=m
CONFIG_MTD_NAND_OMAP_BCH=y
CONFIG_MTD_NAND_CAFE=m
CONFIG_MTD_NAND_PHYTIUM_PCI=m
CONFIG_MTD_NAND_PHYTIUM_PLAT=m
CONFIG_MTD_NAND_MARVELL=m
CONFIG_MTD_NAND_BRCMNAND=m
CONFIG_MTD_NAND_BRCMNAND_BCM63XX=m
CONFIG_MTD_NAND_GPMI_NAND=m
CONFIG_MTD_NAND_FSL_IFC=m
CONFIG_MTD_NAND_MXC=m
CONFIG_MTD_NAND_SUNXI=m
Expand Down Expand Up @@ -1457,6 +1460,9 @@ CONFIG_WIZNET_BUS_DIRECT=y
CONFIG_PHYTMAC=m
CONFIG_PHYTMAC_PLATFORM=m
CONFIG_PHYTMAC_PCI=m
CONFIG_NCE=m
CONFIG_NE6X=m
CONFIG_NE6XVF=m
CONFIG_FDDI=m
CONFIG_DEFXX=m
CONFIG_SKFP=m
Expand Down Expand Up @@ -3793,6 +3799,12 @@ CONFIG_EXTCON_PALMAS=m
CONFIG_EXTCON_RT8973A=m
CONFIG_EXTCON_SM5502=m
CONFIG_ARM_PL172_MPMC=m
CONFIG_BRCMSTB_DPFE=m
CONFIG_BRCMSTB_MEMC=m
CONFIG_OMAP_GPMC=m
CONFIG_FSL_IFC=y
CONFIG_RENESAS_RPCIF=m
CONFIG_STM32_FMC2_EBI=m
CONFIG_IIO=m
CONFIG_IIO_BUFFER_CB=m
CONFIG_IIO_BUFFER_DMAENGINE=m
Expand Down
3 changes: 1 addition & 2 deletions arch/loongarch/configs/deepin_loongarch_desktop_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1452,6 +1452,7 @@ CONFIG_XILINX_EMACLITE=m
CONFIG_XILINX_AXI_EMAC=m
CONFIG_XILINX_LL_TEMAC=m
CONFIG_PCMCIA_XIRC2PS=m
CONFIG_NCE=m
CONFIG_FDDI=m
CONFIG_DEFXX=m
CONFIG_SKFP=m
Expand Down Expand Up @@ -5669,8 +5670,6 @@ CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
CONFIG_FAT_DEFAULT_UTF8=y
CONFIG_EXFAT_FS=y
CONFIG_NTFS_FS=m
CONFIG_NTFS_RW=y
CONFIG_NTFS3_FS=y
CONFIG_NTFS3_LZX_XPRESS=y
CONFIG_NTFS3_FS_POSIX_ACL=y
Expand Down
5 changes: 3 additions & 2 deletions arch/x86/configs/deepin_x86_desktop_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_EFI_MIXED=y
CONFIG_EFI_FAKE_MEMMAP=y
CONFIG_HYGON_CSV=y
CONFIG_LIVEPATCH=y
CONFIG_HIBERNATION=y
CONFIG_PM_WAKELOCKS=y
Expand Down Expand Up @@ -1385,6 +1384,9 @@ CONFIG_WIZNET_W5100_SPI=m
CONFIG_XILINX_AXI_EMAC=m
CONFIG_XILINX_LL_TEMAC=m
CONFIG_PCMCIA_XIRC2PS=m
CONFIG_NCE=m
CONFIG_NE6X=m
CONFIG_NE6XVF=m
CONFIG_FDDI=y
CONFIG_DEFXX=m
CONFIG_SKFP=m
Expand Down Expand Up @@ -4354,7 +4356,6 @@ CONFIG_VFIO_PCI_VGA=y
CONFIG_VIRT_DRIVERS=y
CONFIG_VBOXGUEST=m
CONFIG_NITRO_ENCLAVES=m
CONFIG_CSV_GUEST=m
CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_VDPA=m
CONFIG_VIRTIO_PMEM=m
Expand Down
1 change: 1 addition & 0 deletions drivers/net/ethernet/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -195,5 +195,6 @@ source "drivers/net/ethernet/xilinx/Kconfig"
source "drivers/net/ethernet/xircom/Kconfig"
source "drivers/net/ethernet/phytium/Kconfig"
source "drivers/net/ethernet/guangruntong/Kconfig"
source "drivers/net/ethernet/bzwx/Kconfig"

endif # ETHERNET
1 change: 1 addition & 0 deletions drivers/net/ethernet/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,4 @@ obj-$(CONFIG_NET_VENDOR_SYNOPSYS) += synopsys/
obj-$(CONFIG_NET_VENDOR_PENSANDO) += pensando/
obj-$(CONFIG_NET_VENDOR_PHYTIUM) += phytium/
obj-$(CONFIG_NET_VENDOR_GRT) += guangruntong/
obj-$(CONFIG_NET_VENDOR_BZWX) += bzwx/
21 changes: 21 additions & 0 deletions drivers/net/ethernet/bzwx/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# SPDX-License-Identifier: GPL-2.0-only
#
# BeiZhongWangXin device configuration
#

config NET_VENDOR_BZWX
bool "BeiZhongWangXin devices"
default y
help
If you have a network (Ethernet) card belonging to this class, say Y.

Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all
the questions about BeiZhongWangXin devices. If you say Y, you will be asked
for your specific device in the following questions.

if NET_VENDOR_BZWX

source "drivers/net/ethernet/bzwx/nce/Kconfig"

endif # NET_VENDOR_BZWX
6 changes: 6 additions & 0 deletions drivers/net/ethernet/bzwx/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
#
# Makefile for the BeiZhongWangXin network device drivers.
#

obj-$(CONFIG_NCE) += nce/
35 changes: 35 additions & 0 deletions drivers/net/ethernet/bzwx/nce/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# SPDX-License-Identifier: GPL-2.0-only
#
# BeiZhongWangXin device configuration


config NCE
tristate "BeiZhongWangXin Ethernet Connection N5/N6 Series Support"
depends on PCI
help
This selects the drivers support BeiZhongWangXin Ethernet Connection N5/N6 Series devices.

if NCE

config NE6X
tristate "BeiZhongWangXin Ethernet Connection N5/N6 Series Support"
depends on (PCI_MSI && NETDEVICES && ETHERNET && INET && (X86_64 || ARM64))
select NET_DEVLINK
help
This driver supports BeiZhongWangXin Ethernet Connection N5/N6 Series
of devices.

To compile this driver as a module, choose M here.
The module will be called ncepf.

config NE6XVF
tristate "BeiZhongWangXin Ethernet Connection N5/N6 Series Virtual Function support"
depends on NE6X
help
This driver supports virtual functions for BeiZhongWangXin Ethernet Connection N5/N6 Series
Virtual Function devices.

To compile this driver as a module, choose M here. The module
will be called ncevf.

endif #NCE
34 changes: 34 additions & 0 deletions drivers/net/ethernet/bzwx/nce/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# SPDX-License-Identifier: GPL-2.0
#
# Makefile for the BeiZhongWangXin network device drivers.
#

subdir-ccflags-y += -I$(src)/comm
subdir-ccflags-y += -I$(src)/ne6x
subdir-ccflags-y += -I$(src)/ne6x_vf
ccflags-y += -I$(srctree)/$(src)
ccflags-y += -I$(srctree)/drivers/net/ethernet/bzwx/nce/comm
ccflags-y += -I$(srctree)/drivers/net/ethernet/bzwx/nce/ne6x
ccflags-y += -I$(srctree)/drivers/net/ethernet/bzwx/nce/ne6x_vf

obj-$(CONFIG_NE6X) += ncepf.o
ncepf-objs := comm/txrx.o \
ne6x/ne6x_main.o \
ne6x/ne6x_ethtool.o \
ne6x/ne6x_procfs.o \
ne6x/ne6x_netlink.o \
ne6x/ne6x_interrupt.o \
ne6x/ne6x_reg.o \
ne6x/ne6x_dev.o \
ne6x/ne6x_txrx.o \
ne6x/ne6x_virtchnl_pf.o \
ne6x/ne6x_arfs.o
ncepf-$(CONFIG_DEBUG_FS) += ne6x/ne6x_debugfs.o

obj-$(CONFIG_NE6XVF) += ncevf.o
ncevf-objs := comm/txrx.o \
ne6x_vf/ne6xvf_main.o \
ne6x_vf/ne6xvf_ethtool.o \
ne6x_vf/ne6xvf_virtchnl.o \
ne6x_vf/ne6xvf_txrx.o
ncevf-$(CONFIG_DEBUG_FS) += ne6x_vf/ne6xvf_debugfs.o
Loading