Commit 8977b561 authored by Junxian Huang's avatar Junxian Huang Committed by Leon Romanovsky
Browse files

RDMA/hns: Clean up the legacy CONFIG_INFINIBAND_HNS 



hns driver used to support hip06 and hip08 devices with
CONFIG_INFINIBAND_HNS_HIP06 and CONFIG_INFINIBAND_HNS_HIP08
respectively, which both depended on CONFIG_INFINIBAND_HNS.

But we no longer provide support for hip06 and only support
hip08 and higher since the commit in fixes line, so there is
no need to have CONFIG_INFINIBAND_HNS any more. Remove it and
only keep CONFIG_INFINIBAND_HNS_HIP08.

Fixes: 38d22088 ("RDMA/hns: Remove support for HIP06")
Signed-off-by: default avatarJunxian Huang <huangjunxian6@hisilicon.com>
Link: https://patch.msgid.link/20250106111211.3945051-1-huangjunxian6@hisilicon.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 81468c40

drivers/infiniband/hw/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ obj-$(CONFIG_INFINIBAND_OCRDMA) += ocrdma/ 
obj-$(CONFIG_INFINIBAND_VMWARE_PVRDMA)	+= vmw_pvrdma/

obj-$(CONFIG_INFINIBAND_USNIC)		+= usnic/

obj-$(CONFIG_INFINIBAND_HFI1)		+= hfi1/

obj-$(CONFIG_INFINIBAND_HNS)		+= hns/

obj-$(CONFIG_INFINIBAND_HNS_HIP08)	+= hns/

obj-$(CONFIG_INFINIBAND_QEDR)		+= qedr/

obj-$(CONFIG_INFINIBAND_BNXT_RE)	+= bnxt_re/

obj-$(CONFIG_INFINIBAND_ERDMA)		+= erdma/

drivers/infiniband/hw/hns/Kconfig

+5 −15
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config INFINIBAND_HNS

	tristate "HNS RoCE Driver"

	depends on NET_VENDOR_HISILICON

	depends on ARM64 || (COMPILE_TEST && 64BIT)

	depends on (HNS_DSAF && HNS_ENET) || HNS3

	help

	  This is a RoCE/RDMA driver for the Hisilicon RoCE engine.



	  To compile HIP08 driver as module, choose M here.



config INFINIBAND_HNS_HIP08

	bool "Hisilicon Hip08 Family RoCE support"

	depends on INFINIBAND_HNS && PCI && HNS3

	depends on INFINIBAND_HNS=m || HNS3=y

	tristate "Hisilicon Hip08 Family RoCE support"

	depends on ARM64 || (COMPILE_TEST && 64BIT)

	depends on PCI && HNS3

	help

	  RoCE driver support for Hisilicon RoCE engine in Hisilicon Hip08 SoC.

	  The RoCE engine is a PCI device.



	  To compile this driver, choose Y here: if INFINIBAND_HNS is m, this

	  module will be called hns-roce-hw-v2.
 
	  To compile this driver, choose M here. This module will be called

	  hns-roce-hw-v2.

drivers/infiniband/hw/hns/Makefile

+3 −6
Original line number Diff line number Diff line
@@ -5,12 +5,9 @@ 


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



hns-roce-objs := hns_roce_main.o hns_roce_cmd.o hns_roce_pd.o \

hns-roce-hw-v2-objs := hns_roce_main.o hns_roce_cmd.o hns_roce_pd.o \

	hns_roce_ah.o hns_roce_hem.o hns_roce_mr.o hns_roce_qp.o \

	hns_roce_cq.o hns_roce_alloc.o hns_roce_db.o hns_roce_srq.o hns_roce_restrack.o \

	hns_roce_debugfs.o

	hns_roce_debugfs.o hns_roce_hw_v2.o



ifdef CONFIG_INFINIBAND_HNS_HIP08

hns-roce-hw-v2-objs := hns_roce_hw_v2.o $(hns-roce-objs)

obj-$(CONFIG_INFINIBAND_HNS) += hns-roce-hw-v2.o

endif
 
obj-$(CONFIG_INFINIBAND_HNS_HIP08) += hns-roce-hw-v2.o