Skip to content

Commit 8977b56

Browse files
Junxian Huangrleon
authored andcommitted
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: 38d2208 ("RDMA/hns: Remove support for HIP06") Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com> Link: https://patch.msgid.link/20250106111211.3945051-1-huangjunxian6@hisilicon.com Signed-off-by: Leon Romanovsky <leon@kernel.org>
1 parent 81468c4 commit 8977b56

3 files changed

Lines changed: 9 additions & 22 deletions

File tree

drivers/infiniband/hw/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ obj-$(CONFIG_INFINIBAND_OCRDMA) += ocrdma/
1111
obj-$(CONFIG_INFINIBAND_VMWARE_PVRDMA) += vmw_pvrdma/
1212
obj-$(CONFIG_INFINIBAND_USNIC) += usnic/
1313
obj-$(CONFIG_INFINIBAND_HFI1) += hfi1/
14-
obj-$(CONFIG_INFINIBAND_HNS) += hns/
14+
obj-$(CONFIG_INFINIBAND_HNS_HIP08) += hns/
1515
obj-$(CONFIG_INFINIBAND_QEDR) += qedr/
1616
obj-$(CONFIG_INFINIBAND_BNXT_RE) += bnxt_re/
1717
obj-$(CONFIG_INFINIBAND_ERDMA) += erdma/

drivers/infiniband/hw/hns/Kconfig

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
config INFINIBAND_HNS
3-
tristate "HNS RoCE Driver"
4-
depends on NET_VENDOR_HISILICON
5-
depends on ARM64 || (COMPILE_TEST && 64BIT)
6-
depends on (HNS_DSAF && HNS_ENET) || HNS3
7-
help
8-
This is a RoCE/RDMA driver for the Hisilicon RoCE engine.
9-
10-
To compile HIP08 driver as module, choose M here.
11-
122
config INFINIBAND_HNS_HIP08
13-
bool "Hisilicon Hip08 Family RoCE support"
14-
depends on INFINIBAND_HNS && PCI && HNS3
15-
depends on INFINIBAND_HNS=m || HNS3=y
3+
tristate "Hisilicon Hip08 Family RoCE support"
4+
depends on ARM64 || (COMPILE_TEST && 64BIT)
5+
depends on PCI && HNS3
166
help
177
RoCE driver support for Hisilicon RoCE engine in Hisilicon Hip08 SoC.
188
The RoCE engine is a PCI device.
199

20-
To compile this driver, choose Y here: if INFINIBAND_HNS is m, this
21-
module will be called hns-roce-hw-v2.
10+
To compile this driver, choose M here. This module will be called
11+
hns-roce-hw-v2.

drivers/infiniband/hw/hns/Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@
55

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

8-
hns-roce-objs := hns_roce_main.o hns_roce_cmd.o hns_roce_pd.o \
8+
hns-roce-hw-v2-objs := hns_roce_main.o hns_roce_cmd.o hns_roce_pd.o \
99
hns_roce_ah.o hns_roce_hem.o hns_roce_mr.o hns_roce_qp.o \
1010
hns_roce_cq.o hns_roce_alloc.o hns_roce_db.o hns_roce_srq.o hns_roce_restrack.o \
11-
hns_roce_debugfs.o
11+
hns_roce_debugfs.o hns_roce_hw_v2.o
1212

13-
ifdef CONFIG_INFINIBAND_HNS_HIP08
14-
hns-roce-hw-v2-objs := hns_roce_hw_v2.o $(hns-roce-objs)
15-
obj-$(CONFIG_INFINIBAND_HNS) += hns-roce-hw-v2.o
16-
endif
13+
obj-$(CONFIG_INFINIBAND_HNS_HIP08) += hns-roce-hw-v2.o

0 commit comments

Comments
 (0)