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

!12431 [olk 6.6] net: hibmcge: add support for hibmcge driver

Merge Pull Request from: @chen-hao418 
 
    maillist inclusion
    category: feature
    bugzilla: https://gitee.com/openeuler/kernel/issues/IAZDQX
    CVE: NA 
 
Link:https://gitee.com/openeuler/kernel/pulls/12431

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 5724c14b 7e88b70e
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -9425,15 +9425,21 @@ F: Documentation/devicetree/bindings/arm/hisilicon/low-pin-count.yaml
F:	drivers/bus/hisi_lpc.c
HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)
M:	Yisen Zhuang <yisen.zhuang@huawei.com>
M:	Jian Shen <shenjian15@huawei.com>
M:	Salil Mehta <salil.mehta@huawei.com>
L:	netdev@vger.kernel.org
S:	Maintained
W:	http://www.hisilicon.com
F:	drivers/net/ethernet/hisilicon/hns3/
HISILICON NETWORK HIBMCGE DRIVER
M:	Jijie Shao <shaojijie@huawei.com>
L:	netdev@vger.kernel.org
S:	Maintained
F:	drivers/net/ethernet/hisilicon/hibmcge/
HISILICON NETWORK SUBSYSTEM DRIVER
M:	Yisen Zhuang <yisen.zhuang@huawei.com>
M:	Jian Shen <shenjian15@huawei.com>
M:	Salil Mehta <salil.mehta@huawei.com>
L:	netdev@vger.kernel.org
S:	Maintained
+1 −0
Original line number Diff line number Diff line
@@ -2922,6 +2922,7 @@ CONFIG_HNS3_HCLGE=m
CONFIG_HNS3_DCB=y
CONFIG_HNS3_HCLGEVF=m
CONFIG_HNS3_ENET=m
CONFIG_HIBMCGE=m
CONFIG_NET_VENDOR_HUAWEI=y
CONFIG_HINIC=m
CONFIG_HINIC3=m
+3 −0
Original line number Diff line number Diff line
@@ -2213,6 +2213,9 @@ CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
CONFIG_UNACCEPTED_MEMORY=y
# end of EFI (Extensible Firmware Interface) Support

CONFIG_NET_VENDOR_HISILICON=y
CONFIG_HIBMCGE=m

CONFIG_UEFI_CPER=y
CONFIG_UEFI_CPER_X86=y

+17 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ config NET_VENDOR_HISILICON
	bool "Hisilicon devices"
	default y
	depends on OF || ACPI
	depends on ARM || ARM64 || COMPILE_TEST
	help
	  If you have a network (Ethernet) card belonging to this class, say Y.

@@ -18,6 +17,8 @@ config NET_VENDOR_HISILICON

if NET_VENDOR_HISILICON

if ARM || ARM64 || COMPILE_TEST

config HIX5HD2_GMAC
	tristate "Hisilicon HIX5HD2 Family Network Device Support"
	select PHYLIB
@@ -142,4 +143,19 @@ config HNS3_ENET

endif #HNS3

endif # ARM || ARM64 || COMPILE_TEST

config HIBMCGE
	tristate "Hisilicon BMC Gigabit Ethernet Device Support"
	depends on PCI && PCI_MSI
	select PHYLIB
	select MOTORCOMM_PHY
	select REALTEK_PHY
	help
	  If you wish to compile a kernel for a BMC with HIBMC-xx_gmac
	  then you should answer Y to this. This makes this driver suitable for use
	  on certain boards such as the HIBMC-210.

	  If you are unsure, say N.

endif # NET_VENDOR_HISILICON
+1 −0
Original line number Diff line number Diff line
@@ -9,3 +9,4 @@ obj-$(CONFIG_HNS_MDIO) += hns_mdio.o
obj-$(CONFIG_HNS) += hns/
obj-$(CONFIG_HNS3) += hns3/
obj-$(CONFIG_HISI_FEMAC) += hisi_femac.o
obj-$(CONFIG_HIBMCGE) += hibmcge/
Loading