diff options
author | Jan Glauber <jang@linux.vnet.ibm.com> | 2012-11-29 08:38:46 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-11-30 11:47:27 -0500 |
commit | c8717a3d66ad697158f7a0dd6045fec280c8d723 (patch) | |
tree | fc4fbd4d584e3c176bf16013ad8d43a3e84a1150 /arch/s390/Kconfig | |
parent | 1e8da9566b56e371902381f42e209df79090486e (diff) |
s390/pci: add PCI Kconfig options
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>
Diffstat (limited to 'arch/s390/Kconfig')
-rw-r--r-- | arch/s390/Kconfig | 56 |
1 files changed, 50 insertions, 6 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 1bf4b294c6e9..f39a6f54c353 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
@@ -34,12 +34,6 @@ config GENERIC_BUG | |||
34 | config GENERIC_BUG_RELATIVE_POINTERS | 34 | config GENERIC_BUG_RELATIVE_POINTERS |
35 | def_bool y | 35 | def_bool y |
36 | 36 | ||
37 | config NO_IOMEM | ||
38 | def_bool y | ||
39 | |||
40 | config NO_DMA | ||
41 | def_bool y | ||
42 | |||
43 | config ARCH_DMA_ADDR_T_64BIT | 37 | config ARCH_DMA_ADDR_T_64BIT |
44 | def_bool 64BIT | 38 | def_bool 64BIT |
45 | 39 | ||
@@ -58,6 +52,12 @@ config KEXEC | |||
58 | config AUDIT_ARCH | 52 | config AUDIT_ARCH |
59 | def_bool y | 53 | def_bool y |
60 | 54 | ||
55 | config NO_IOPORT | ||
56 | def_bool y | ||
57 | |||
58 | config PCI_QUIRKS | ||
59 | def_bool n | ||
60 | |||
61 | config S390 | 61 | config S390 |
62 | def_bool y | 62 | def_bool y |
63 | select USE_GENERIC_SMP_HELPERS if SMP | 63 | select USE_GENERIC_SMP_HELPERS if SMP |
@@ -435,6 +435,50 @@ config QDIO | |||
435 | 435 | ||
436 | If unsure, say Y. | 436 | If unsure, say Y. |
437 | 437 | ||
438 | menuconfig PCI | ||
439 | bool "PCI support" | ||
440 | default n | ||
441 | depends on 64BIT | ||
442 | select ARCH_SUPPORTS_MSI | ||
443 | select PCI_MSI | ||
444 | help | ||
445 | Enable PCI support. | ||
446 | |||
447 | if PCI | ||
448 | |||
449 | config PCI_NR_FUNCTIONS | ||
450 | int "Maximum number of PCI functions (1-4096)" | ||
451 | range 1 4096 | ||
452 | default "64" | ||
453 | help | ||
454 | This allows you to specify the maximum number of PCI functions which | ||
455 | this kernel will support. | ||
456 | |||
457 | source "drivers/pci/Kconfig" | ||
458 | source "drivers/pci/pcie/Kconfig" | ||
459 | source "drivers/pci/hotplug/Kconfig" | ||
460 | |||
461 | endif # PCI | ||
462 | |||
463 | config PCI_DOMAINS | ||
464 | def_bool PCI | ||
465 | |||
466 | config HAS_IOMEM | ||
467 | def_bool PCI | ||
468 | |||
469 | config IOMMU_HELPER | ||
470 | def_bool PCI | ||
471 | |||
472 | config HAS_DMA | ||
473 | def_bool PCI | ||
474 | select HAVE_DMA_API_DEBUG | ||
475 | |||
476 | config NEED_SG_DMA_LENGTH | ||
477 | def_bool PCI | ||
478 | |||
479 | config HAVE_DMA_ATTRS | ||
480 | def_bool PCI | ||
481 | |||
438 | config CHSC_SCH | 482 | config CHSC_SCH |
439 | def_tristate m | 483 | def_tristate m |
440 | prompt "Support for CHSC subchannels" | 484 | prompt "Support for CHSC subchannels" |