Browse Source

IB: Move PCI dependency from root KConfig to HW's KConfigs

No reason to have dependency on PCI for the entire infiniband stack so
move it to KConfig of only the drivers that actually using PCI.

Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Yuval Shaia 8 years ago
parent
commit
931bc0d916

+ 0 - 1
drivers/infiniband/Kconfig

@@ -1,6 +1,5 @@
 menuconfig INFINIBAND
 menuconfig INFINIBAND
 	tristate "InfiniBand support"
 	tristate "InfiniBand support"
-	depends on PCI || BROKEN
 	depends on HAS_IOMEM
 	depends on HAS_IOMEM
 	depends on NET
 	depends on NET
 	depends on INET
 	depends on INET

+ 1 - 0
drivers/infiniband/hw/i40iw/Kconfig

@@ -1,6 +1,7 @@
 config INFINIBAND_I40IW
 config INFINIBAND_I40IW
 	tristate "Intel(R) Ethernet X722 iWARP Driver"
 	tristate "Intel(R) Ethernet X722 iWARP Driver"
 	depends on INET && I40E
 	depends on INET && I40E
+	depends on PCI
 	select GENERIC_ALLOCATOR
 	select GENERIC_ALLOCATOR
 	---help---
 	---help---
 	Intel(R) Ethernet X722 iWARP Driver
 	Intel(R) Ethernet X722 iWARP Driver

+ 1 - 0
drivers/infiniband/hw/qedr/Kconfig

@@ -1,6 +1,7 @@
 config INFINIBAND_QEDR
 config INFINIBAND_QEDR
 	tristate "QLogic RoCE driver"
 	tristate "QLogic RoCE driver"
 	depends on 64BIT && QEDE
 	depends on 64BIT && QEDE
+	depends on PCI
 	select QED_LL2
 	select QED_LL2
 	select QED_RDMA
 	select QED_RDMA
 	---help---
 	---help---

+ 1 - 0
drivers/infiniband/hw/qib/Kconfig

@@ -1,6 +1,7 @@
 config INFINIBAND_QIB
 config INFINIBAND_QIB
 	tristate "Intel PCIe HCA support"
 	tristate "Intel PCIe HCA support"
 	depends on 64BIT && INFINIBAND_RDMAVT
 	depends on 64BIT && INFINIBAND_RDMAVT
+	depends on PCI
 	---help---
 	---help---
 	This is a low-level driver for Intel PCIe QLE InfiniBand host
 	This is a low-level driver for Intel PCIe QLE InfiniBand host
 	channel adapters.  This driver does not support the Intel
 	channel adapters.  This driver does not support the Intel

+ 1 - 0
drivers/infiniband/sw/rdmavt/Kconfig

@@ -1,6 +1,7 @@
 config INFINIBAND_RDMAVT
 config INFINIBAND_RDMAVT
 	tristate "RDMA verbs transport library"
 	tristate "RDMA verbs transport library"
 	depends on 64BIT
 	depends on 64BIT
+	depends on PCI
 	select DMA_VIRT_OPS
 	select DMA_VIRT_OPS
 	---help---
 	---help---
 	This is a common software verbs provider for RDMA networks.
 	This is a common software verbs provider for RDMA networks.

+ 0 - 1
drivers/infiniband/ulp/ipoib/ipoib_main.c

@@ -51,7 +51,6 @@
 #include <net/addrconf.h>
 #include <net/addrconf.h>
 #include <linux/inetdevice.h>
 #include <linux/inetdevice.h>
 #include <rdma/ib_cache.h>
 #include <rdma/ib_cache.h>
-#include <linux/pci.h>
 
 
 #define DRV_VERSION "1.0.0"
 #define DRV_VERSION "1.0.0"
 
 

+ 1 - 1
drivers/staging/lustre/lnet/Kconfig

@@ -34,7 +34,7 @@ config LNET_SELFTEST
 
 
 config LNET_XPRT_IB
 config LNET_XPRT_IB
 	tristate "LNET infiniband support"
 	tristate "LNET infiniband support"
-	depends on LNET && INFINIBAND && INFINIBAND_ADDR_TRANS
+	depends on LNET && PCI && INFINIBAND && INFINIBAND_ADDR_TRANS
 	default LNET && INFINIBAND
 	default LNET && INFINIBAND
 	help
 	help
 	  This option allows the LNET users to use infiniband as an
 	  This option allows the LNET users to use infiniband as an