Skip to contentSkip to conversation

RDMA: fix dependencies for rdma_user_mmap_io

PATCH In review Arnd Bergmann 2 participants 2 messages Sep 26, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 RDMA: fix dependencies for rdma_user_mmap_io

The mlx4 driver produces a link error when it is configured as built-in while CONFIG_INFINIBAND_USER_ACCESS is set to =m:

drivers/infiniband/hw/mlx4/main.o: In function `mlx4_ib_mmap':
main.c:(.text+0x1af4): undefined reference to `rdma_user_mmap_io'

The same function is called from mlx5, which already has a dependency to ensure we can call it, and from hns, which appears to suffer from the same problem.

This adds the same dependency that mlx5 uses to the other two.

Fixes 6745d356ab39 ("RDMA/hns: Use rdma_user_mmap_io")
Fixes c282da4109e4 ("RDMA/mlx4: Use rdma_user_mmap_io")
---
 drivers/infiniband/hw/hns/Kconfig  | 1 +
 drivers/infiniband/hw/mlx4/Kconfig | 1 +
 2 files changed, 2 insertions(+)
drivers/infiniband/hw/hns/Kconfig +1 -0
index fddb5fdf92de..21c2100b2ea9 100644
@@ -1,6 +1,7 @@
 config INFINIBAND_HNS
 	tristate "HNS RoCE Driver"
 	depends on NET_VENDOR_HISILICON
+	depends on INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS
 	depends on ARM64 || (COMPILE_TEST && 64BIT)
 	---help---
 	  This is a RoCE/RDMA driver for the Hisilicon RoCE engine. The engine
drivers/infiniband/hw/mlx4/Kconfig +1 -0
index db4aa13ebae0..d1de3285fd88 100644
@@ -1,6 +1,7 @@
 config MLX4_INFINIBAND
 	tristate "Mellanox ConnectX HCA support"
 	depends on NETDEVICES && ETHERNET && PCI && INET
+	depends on INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS
 	depends on MAY_USE_DEVLINK
 	select NET_VENDOR_MELLANOX
 	select MLX4_CORE
Signature · 1 line
2.18.0
#1 lore raw
Quoted 12 lines · Arnd Bergmann

The mlx4 driver produces a link error when it is configured as built-in while CONFIG_INFINIBAND_USER_ACCESS is set to =m:

drivers/infiniband/hw/mlx4/main.o: In function `mlx4_ib_mmap':
main.c:(.text+0x1af4): undefined reference to `rdma_user_mmap_io'

The same function is called from mlx5, which already has a dependency to ensure we can call it, and from hns, which appears to suffer from the same problem.

This adds the same dependency that mlx5 uses to the other two.

Quoted 7 lines
Fixes 6745d356ab39 ("RDMA/hns: Use rdma_user_mmap_io")
Fixes c282da4109e4 ("RDMA/mlx4: Use rdma_user_mmap_io")
---
 drivers/infiniband/hw/hns/Kconfig  | 1 +
 drivers/infiniband/hw/mlx4/Kconfig | 1 +
 2 files changed, 2 insertions(+)

Woops, thanks Arnd, applied to for-next

Jason