* [PATCH] RDMA: fix dependencies for rdma_user_mmap_io
@ 2018-09-26 19:36 Arnd Bergmann
2018-09-26 19:51 ` Jason Gunthorpe
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2018-09-26 19:36 UTC (permalink / raw)
To: Lijun Ou, Wei Hu(Xavier), Doug Ledford, Jason Gunthorpe,
Yishai Hadas
Cc: Arnd Bergmann, Shaobo Xu, linux-rdma, linux-kernel
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")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/infiniband/hw/hns/Kconfig | 1 +
drivers/infiniband/hw/mlx4/Kconfig | 1 +
2 files changed, 2 insertions(+)
diff --git a/drivers/infiniband/hw/hns/Kconfig b/drivers/infiniband/hw/hns/Kconfig
index fddb5fdf92de..21c2100b2ea9 100644
--- a/drivers/infiniband/hw/hns/Kconfig
+++ b/drivers/infiniband/hw/hns/Kconfig
@@ -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
diff --git a/drivers/infiniband/hw/mlx4/Kconfig b/drivers/infiniband/hw/mlx4/Kconfig
index db4aa13ebae0..d1de3285fd88 100644
--- a/drivers/infiniband/hw/mlx4/Kconfig
+++ b/drivers/infiniband/hw/mlx4/Kconfig
@@ -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
--
2.18.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] RDMA: fix dependencies for rdma_user_mmap_io
2018-09-26 19:36 [PATCH] RDMA: fix dependencies for rdma_user_mmap_io Arnd Bergmann
@ 2018-09-26 19:51 ` Jason Gunthorpe
0 siblings, 0 replies; 2+ messages in thread
From: Jason Gunthorpe @ 2018-09-26 19:51 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Lijun Ou, Wei Hu(Xavier), Doug Ledford, Yishai Hadas, Shaobo Xu,
linux-rdma, linux-kernel
On Wed, Sep 26, 2018 at 09:36:52PM +0200, Arnd Bergmann wrote:
> 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")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-09-26 19:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-26 19:36 [PATCH] RDMA: fix dependencies for rdma_user_mmap_io Arnd Bergmann
2018-09-26 19:51 ` Jason Gunthorpe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).