Commit 1ff5e788 authored by weiwei1's avatar weiwei1
Browse files

improve 3SNIC 910/920/930 NIC driver 

3snic inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9G2ZS?from=project-issue


CVE: NA

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

This commit is to improve 3SNIC 910/920/930 driver:
abandon sssdk.ko and only export sssnic.ko

Signed-off-by: default avatarweiwei1 <weiwei1@ramaxel.com>
parent 7c7ad035

arch/arm64/configs/openeuler_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -2807,7 +2807,6 @@ CONFIG_MDIO=m 
# CONFIG_NET_VENDOR_3COM is not set

CONFIG_NET_VENDOR_3SNIC=y

CONFIG_SSSNIC=m

CONFIG_SSSNIC_HW=m

# CONFIG_NET_VENDOR_ADAPTEC is not set

# CONFIG_NET_VENDOR_AGERE is not set

CONFIG_NET_VENDOR_ALACRITECH=y

arch/x86/configs/openeuler_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -2806,7 +2806,6 @@ CONFIG_MDIO=m 
# CONFIG_NET_VENDOR_3COM is not set

CONFIG_NET_VENDOR_3SNIC=y

CONFIG_SSSNIC=m

CONFIG_SSSNIC_HW=m

# CONFIG_NET_VENDOR_ADAPTEC is not set

# CONFIG_NET_VENDOR_AGERE is not set

# CONFIG_NET_VENDOR_ALACRITECH is not set

drivers/net/ethernet/3snic/sssnic/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ config SSSNIC 
	tristate "3SNIC Ethernet Controller SSSNIC Support"

	depends on PCI

	depends on ARM64 || X86_64

	select SSSNIC_HW

	help

	  This driver supports 3SNIC Ethernet Controller SSSNIC device.

	  For more information about this product, go to the product
@@ -17,7 +16,3 @@ config SSSNIC 


	  To compile this driver as a module, choose M here. The module

	  will be called sssnic.
 


config SSSNIC_HW

	tristate

	depends on PCI

drivers/net/ethernet/3snic/sssnic/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -3,5 +3,4 @@ 
# Makefile for the 3SNIC network device drivers.

#



obj-$(CONFIG_SSSNIC_HW) += hw/

obj-$(CONFIG_SSSNIC) += nic/

drivers/net/ethernet/3snic/sssnic/hw/Makefile

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

# Copyright (c) 2023 3SNIC

#

SYS_TIME=$(shell date +%Y-%m-%d_%H:%M:%S)

ccflags-y += -D __TIME_STR__=\"$(SYS_TIME)\"



ccflags-y += -I$(srctree)/drivers/net/ethernet/3snic/sssnic/hw

ccflags-y += -I$(srctree)/drivers/net/ethernet/3snic/sssnic/hw/tool

ccflags-y += -I$(srctree)/drivers/net/ethernet/3snic/sssnic/include

ccflags-y += -I$(srctree)/drivers/net/ethernet/3snic/sssnic/include/hw

ccflags-y += -I$(srctree)/drivers/net/ethernet/3snic/sssnic/include/kernel

ccflags-y += -I$(srctree)/drivers/net/ethernet/3snic/sssnic/hw/include



ccflags-y += -Werror

ccflags-y += -Wno-implicit-fallthrough



obj-$(CONFIG_SSSNIC_HW) += sssdk.o

sssdk-y := sss_hw_main.o \

			sss_pci.o \

			sss_pci_probe.o \

			sss_pci_remove.o \

			sss_pci_shutdown.o \

			sss_pci_error.o \

			sss_pci_sriov.o \

			sss_pci_global.o \

			sss_hwdev_api.o \

			sss_hwdev_cap.o \

			sss_hwdev_export.o \

			sss_hwdev_link.o \

			sss_hwdev_init.o \

			sss_hwdev_mgmt_info.o \

			sss_hwdev_mgmt_channel.o \

			sss_hwdev_io_flush.o \

			sss_hwif_ctrlq.o \

			sss_hwif_ctrlq_init.o \

			sss_hwif_ctrlq_export.o \

			sss_hwif_mbx.o \

			sss_hwif_mbx_init.o \

			sss_hwif_mbx_export.o \

			sss_hwif_adm.o \

			sss_hwif_adm_init.o \

			sss_hwif_init.o \

			sss_hwif_api.o \

			sss_hwif_export.o \

			sss_hwif_eq.o \

			sss_hwif_mgmt_init.o \

			sss_hwif_irq.o \

			sss_hwif_aeq.o \

			sss_common.o \

			sss_wq.o \

			sss_hwif_ceq.o \

			sss_adapter_mgmt.o \

			./tool/sss_tool_main.o \

			./tool/sss_tool_chip.o \

			./tool/sss_tool_sdk.o \

			./tool/sss_tool_sm.o