diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-08-09 16:27:07 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2013-08-12 11:26:48 -0400 |
commit | ebd97be635bff43239f391a49c78b98818c589fe (patch) | |
tree | a399d0eb822a2937040efc86882bd28e79008ab1 /arch | |
parent | 4287d824f265451cd10f6d20266b27a207a6cdd7 (diff) |
PCI: remove ARCH_SUPPORTS_MSI kconfig option
Now that we have weak versions for each of the PCI MSI architecture
functions, we can actually build the MSI support for all platforms,
regardless of whether they provide or not architecture-specific
versions of those functions. For this reason, the ARCH_SUPPORTS_MSI
hidden kconfig boolean becomes useless, and this patch gets rid of it.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Tested-by: Daniel Price <daniel.price@gmail.com>
Tested-by: Thierry Reding <thierry.reding@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux390@de.ibm.com
Cc: linux-s390@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64@vger.kernel.org
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: David S. Miller <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Cc: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/ia64/Kconfig | 1 | ||||
-rw-r--r-- | arch/mips/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/Kconfig | 1 | ||||
-rw-r--r-- | arch/s390/Kconfig | 1 | ||||
-rw-r--r-- | arch/sparc/Kconfig | 1 | ||||
-rw-r--r-- | arch/tile/Kconfig | 1 | ||||
-rw-r--r-- | arch/x86/Kconfig | 1 |
8 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ba412e02ec0c..b173c1d8721f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -441,7 +441,6 @@ config ARCH_NETX | |||
441 | config ARCH_IOP13XX | 441 | config ARCH_IOP13XX |
442 | bool "IOP13xx-based" | 442 | bool "IOP13xx-based" |
443 | depends on MMU | 443 | depends on MMU |
444 | select ARCH_SUPPORTS_MSI | ||
445 | select CPU_XSC3 | 444 | select CPU_XSC3 |
446 | select NEED_MACH_MEMORY_H | 445 | select NEED_MACH_MEMORY_H |
447 | select NEED_RET_TO_USER | 446 | select NEED_RET_TO_USER |
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 5a768ad8e893..098602b939a9 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -9,7 +9,6 @@ config IA64 | |||
9 | select PCI if (!IA64_HP_SIM) | 9 | select PCI if (!IA64_HP_SIM) |
10 | select ACPI if (!IA64_HP_SIM) | 10 | select ACPI if (!IA64_HP_SIM) |
11 | select PM if (!IA64_HP_SIM) | 11 | select PM if (!IA64_HP_SIM) |
12 | select ARCH_SUPPORTS_MSI | ||
13 | select HAVE_UNSTABLE_SCHED_CLOCK | 12 | select HAVE_UNSTABLE_SCHED_CLOCK |
14 | select HAVE_IDE | 13 | select HAVE_IDE |
15 | select HAVE_OPROFILE | 14 | select HAVE_OPROFILE |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 4758a8fd3e99..00b26986cd05 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -726,7 +726,6 @@ config CAVIUM_OCTEON_SOC | |||
726 | select SYS_HAS_CPU_CAVIUM_OCTEON | 726 | select SYS_HAS_CPU_CAVIUM_OCTEON |
727 | select SWAP_IO_SPACE | 727 | select SWAP_IO_SPACE |
728 | select HW_HAS_PCI | 728 | select HW_HAS_PCI |
729 | select ARCH_SUPPORTS_MSI | ||
730 | select ZONE_DMA32 | 729 | select ZONE_DMA32 |
731 | select USB_ARCH_HAS_OHCI | 730 | select USB_ARCH_HAS_OHCI |
732 | select USB_ARCH_HAS_EHCI | 731 | select USB_ARCH_HAS_EHCI |
@@ -762,7 +761,6 @@ config NLM_XLR_BOARD | |||
762 | select CEVT_R4K | 761 | select CEVT_R4K |
763 | select CSRC_R4K | 762 | select CSRC_R4K |
764 | select IRQ_CPU | 763 | select IRQ_CPU |
765 | select ARCH_SUPPORTS_MSI | ||
766 | select ZONE_DMA32 if 64BIT | 764 | select ZONE_DMA32 if 64BIT |
767 | select SYNC_R4K | 765 | select SYNC_R4K |
768 | select SYS_HAS_EARLY_PRINTK | 766 | select SYS_HAS_EARLY_PRINTK |
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 3bf72cd2c8fc..183a16509e8f 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -727,7 +727,6 @@ config PCI | |||
727 | default y if !40x && !CPM2 && !8xx && !PPC_83xx \ | 727 | default y if !40x && !CPM2 && !8xx && !PPC_83xx \ |
728 | && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON | 728 | && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON |
729 | default PCI_QSPAN if !4xx && !CPM2 && 8xx | 729 | default PCI_QSPAN if !4xx && !CPM2 && 8xx |
730 | select ARCH_SUPPORTS_MSI | ||
731 | select GENERIC_PCI_IOMAP | 730 | select GENERIC_PCI_IOMAP |
732 | help | 731 | help |
733 | Find out whether your system includes a PCI bus. PCI is the name of | 732 | Find out whether your system includes a PCI bus. PCI is the name of |
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 22f75b504f7f..e9982a353b55 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
@@ -428,7 +428,6 @@ menuconfig PCI | |||
428 | bool "PCI support" | 428 | bool "PCI support" |
429 | default n | 429 | default n |
430 | depends on 64BIT | 430 | depends on 64BIT |
431 | select ARCH_SUPPORTS_MSI | ||
432 | select PCI_MSI | 431 | select PCI_MSI |
433 | help | 432 | help |
434 | Enable PCI support. | 433 | Enable PCI support. |
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index a00cbd356db5..1570ad2802b3 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
@@ -52,7 +52,6 @@ config SPARC32 | |||
52 | 52 | ||
53 | config SPARC64 | 53 | config SPARC64 |
54 | def_bool 64BIT | 54 | def_bool 64BIT |
55 | select ARCH_SUPPORTS_MSI | ||
56 | select HAVE_FUNCTION_TRACER | 55 | select HAVE_FUNCTION_TRACER |
57 | select HAVE_FUNCTION_GRAPH_TRACER | 56 | select HAVE_FUNCTION_GRAPH_TRACER |
58 | select HAVE_FUNCTION_GRAPH_FP_TEST | 57 | select HAVE_FUNCTION_GRAPH_FP_TEST |
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig index 24565a7ffe6d..74dff908a70f 100644 --- a/arch/tile/Kconfig +++ b/arch/tile/Kconfig | |||
@@ -380,7 +380,6 @@ config PCI | |||
380 | select PCI_DOMAINS | 380 | select PCI_DOMAINS |
381 | select GENERIC_PCI_IOMAP | 381 | select GENERIC_PCI_IOMAP |
382 | select TILE_GXIO_TRIO if TILEGX | 382 | select TILE_GXIO_TRIO if TILEGX |
383 | select ARCH_SUPPORTS_MSI if TILEGX | ||
384 | select PCI_MSI if TILEGX | 383 | select PCI_MSI if TILEGX |
385 | ---help--- | 384 | ---help--- |
386 | Enable PCI root complex support, so PCIe endpoint devices can | 385 | Enable PCI root complex support, so PCIe endpoint devices can |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b32ebf92b0ce..5db62ef37804 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -2014,7 +2014,6 @@ menu "Bus options (PCI etc.)" | |||
2014 | config PCI | 2014 | config PCI |
2015 | bool "PCI support" | 2015 | bool "PCI support" |
2016 | default y | 2016 | default y |
2017 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) | ||
2018 | ---help--- | 2017 | ---help--- |
2019 | Find out whether you have a PCI motherboard. PCI is the name of a | 2018 | Find out whether you have a PCI motherboard. PCI is the name of a |
2020 | bus system, i.e. the way the CPU talks to the other stuff inside | 2019 | bus system, i.e. the way the CPU talks to the other stuff inside |