50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Wed, 9 May 2018 22:31:41 +0100
|
|
Subject: IB: Fix RDMA_RXE and INFINIBAND_RDMAVT dependencies for DMA_VIRT_OPS
|
|
|
|
DMA_VIRT_OPS requires that dma_addr_t is at least as wide as a
|
|
pointer, which is expressed as a dependency on !64BIT ||
|
|
ARCH_DMA_ADDR_T_64BIT.
|
|
|
|
For parisc64 this is not true, and if these IB modules are enabled,
|
|
kconfig warns:
|
|
|
|
WARNING: unmet direct dependencies detected for DMA_VIRT_OPS
|
|
Depends on [n]: HAS_DMA [=y] && (!64BIT [=y] || ARCH_DMA_ADDR_T_64BIT)
|
|
Selected by [m]:
|
|
- INFINIBAND_RDMAVT [=m] && INFINIBAND [=m] && 64BIT [=y] && PCI [=y]
|
|
- RDMA_RXE [=m] && INET [=y] && PCI [=y] && INFINIBAND [=m]
|
|
|
|
Add dependencies to fix this.
|
|
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/infiniband/sw/rdmavt/Kconfig | 2 +-
|
|
drivers/infiniband/sw/rxe/Kconfig | 1 +
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/infiniband/sw/rdmavt/Kconfig b/drivers/infiniband/sw/rdmavt/Kconfig
|
|
index 2b5513da7e83..98e798007f75 100644
|
|
--- a/drivers/infiniband/sw/rdmavt/Kconfig
|
|
+++ b/drivers/infiniband/sw/rdmavt/Kconfig
|
|
@@ -1,6 +1,6 @@
|
|
config INFINIBAND_RDMAVT
|
|
tristate "RDMA verbs transport library"
|
|
- depends on 64BIT
|
|
+ depends on 64BIT && ARCH_DMA_ADDR_T_64BIT
|
|
depends on PCI
|
|
select DMA_VIRT_OPS
|
|
---help---
|
|
diff --git a/drivers/infiniband/sw/rxe/Kconfig b/drivers/infiniband/sw/rxe/Kconfig
|
|
index bad4a576d7cf..67ae960ab523 100644
|
|
--- a/drivers/infiniband/sw/rxe/Kconfig
|
|
+++ b/drivers/infiniband/sw/rxe/Kconfig
|
|
@@ -1,6 +1,7 @@
|
|
config RDMA_RXE
|
|
tristate "Software RDMA over Ethernet (RoCE) driver"
|
|
depends on INET && PCI && INFINIBAND
|
|
+ depends on !64BIT || ARCH_DMA_ADDR_T_64BIT
|
|
select NET_UDP_TUNNEL
|
|
select CRYPTO_CRC32
|
|
select DMA_VIRT_OPS
|