s390/pci: add PCI Kconfig options
authorJan Glauber <jang@linux.vnet.ibm.com>
Thu, 29 Nov 2012 13:38:46 +0000 (14:38 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Fri, 30 Nov 2012 16:47:27 +0000 (17:47 +0100)
CONFIG_PCI is disabled by default currently.

Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/Kconfig

index 1bf4b29..f39a6f5 100644 (file)
@@ -34,12 +34,6 @@ config GENERIC_BUG
 config GENERIC_BUG_RELATIVE_POINTERS
        def_bool y
 
-config NO_IOMEM
-       def_bool y
-
-config NO_DMA
-       def_bool y
-
 config ARCH_DMA_ADDR_T_64BIT
        def_bool 64BIT
 
@@ -58,6 +52,12 @@ config KEXEC
 config AUDIT_ARCH
        def_bool y
 
+config NO_IOPORT
+       def_bool y
+
+config PCI_QUIRKS
+       def_bool n
+
 config S390
        def_bool y
        select USE_GENERIC_SMP_HELPERS if SMP
@@ -435,6 +435,50 @@ config QDIO
 
          If unsure, say Y.
 
+menuconfig PCI
+       bool "PCI support"
+       default n
+       depends on 64BIT
+       select ARCH_SUPPORTS_MSI
+       select PCI_MSI
+       help
+         Enable PCI support.
+
+if PCI
+
+config PCI_NR_FUNCTIONS
+       int "Maximum number of PCI functions (1-4096)"
+       range 1 4096
+       default "64"
+       help
+         This allows you to specify the maximum number of PCI functions which
+         this kernel will support.
+
+source "drivers/pci/Kconfig"
+source "drivers/pci/pcie/Kconfig"
+source "drivers/pci/hotplug/Kconfig"
+
+endif  # PCI
+
+config PCI_DOMAINS
+       def_bool PCI
+
+config HAS_IOMEM
+       def_bool PCI
+
+config IOMMU_HELPER
+       def_bool PCI
+
+config HAS_DMA
+       def_bool PCI
+       select HAVE_DMA_API_DEBUG
+
+config NEED_SG_DMA_LENGTH
+       def_bool PCI
+
+config HAVE_DMA_ATTRS
+       def_bool PCI
+
 config CHSC_SCH
        def_tristate m
        prompt "Support for CHSC subchannels"