153 lines
4.6 KiB
Diff
153 lines
4.6 KiB
Diff
|
From c819a1b0907257d73de96af33d557668a5c0c895 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||
|
|
Date: Mon, 1 Jul 2013 14:26:57 +0200
|
||
|
|
Subject: [PATCH 071/203] 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>
|
||
|
|
---
|
||
|
|
arch/arm/Kconfig | 1 -
|
||
|
|
arch/ia64/Kconfig | 1 -
|
||
|
|
arch/mips/Kconfig | 2 --
|
||
|
|
arch/powerpc/Kconfig | 1 -
|
||
|
|
arch/s390/Kconfig | 1 -
|
||
|
|
arch/sparc/Kconfig | 1 -
|
||
|
|
arch/tile/Kconfig | 1 -
|
||
|
|
arch/x86/Kconfig | 1 -
|
||
|
|
drivers/pci/Kconfig | 4 ----
|
||
|
|
9 files changed, 13 deletions(-)
|
||
|
|
|
||
|
|
--- a/arch/arm/Kconfig
|
||
|
|
+++ b/arch/arm/Kconfig
|
||
|
|
@@ -435,7 +435,6 @@ config ARCH_NETX
|
||
|
|
config ARCH_IOP13XX
|
||
|
|
bool "IOP13xx-based"
|
||
|
|
depends on MMU
|
||
|
|
- select ARCH_SUPPORTS_MSI
|
||
|
|
select CPU_XSC3
|
||
|
|
select NEED_MACH_MEMORY_H
|
||
|
|
select NEED_RET_TO_USER
|
||
|
|
--- a/arch/ia64/Kconfig
|
||
|
|
+++ b/arch/ia64/Kconfig
|
||
|
|
@@ -9,7 +9,6 @@ config IA64
|
||
|
|
select PCI if (!IA64_HP_SIM)
|
||
|
|
select ACPI if (!IA64_HP_SIM)
|
||
|
|
select PM if (!IA64_HP_SIM)
|
||
|
|
- select ARCH_SUPPORTS_MSI
|
||
|
|
select HAVE_UNSTABLE_SCHED_CLOCK
|
||
|
|
select HAVE_IDE
|
||
|
|
select HAVE_OPROFILE
|
||
|
|
--- a/arch/mips/Kconfig
|
||
|
|
+++ b/arch/mips/Kconfig
|
||
|
|
@@ -764,7 +764,6 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
|
||
|
|
select SYS_HAS_CPU_CAVIUM_OCTEON
|
||
|
|
select SWAP_IO_SPACE
|
||
|
|
select HW_HAS_PCI
|
||
|
|
- select ARCH_SUPPORTS_MSI
|
||
|
|
select ZONE_DMA32
|
||
|
|
select USB_ARCH_HAS_OHCI
|
||
|
|
select USB_ARCH_HAS_EHCI
|
||
|
|
@@ -800,7 +799,6 @@ config NLM_XLR_BOARD
|
||
|
|
select CEVT_R4K
|
||
|
|
select CSRC_R4K
|
||
|
|
select IRQ_CPU
|
||
|
|
- select ARCH_SUPPORTS_MSI
|
||
|
|
select ZONE_DMA32 if 64BIT
|
||
|
|
select SYNC_R4K
|
||
|
|
select SYS_HAS_EARLY_PRINTK
|
||
|
|
--- a/arch/powerpc/Kconfig
|
||
|
|
+++ b/arch/powerpc/Kconfig
|
||
|
|
@@ -734,7 +734,6 @@ config PCI
|
||
|
|
default y if !40x && !CPM2 && !8xx && !PPC_83xx \
|
||
|
|
&& !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON
|
||
|
|
default PCI_QSPAN if !4xx && !CPM2 && 8xx
|
||
|
|
- select ARCH_SUPPORTS_MSI
|
||
|
|
select GENERIC_PCI_IOMAP
|
||
|
|
help
|
||
|
|
Find out whether your system includes a PCI bus. PCI is the name of
|
||
|
|
--- a/arch/s390/Kconfig
|
||
|
|
+++ b/arch/s390/Kconfig
|
||
|
|
@@ -430,7 +430,6 @@ menuconfig PCI
|
||
|
|
bool "PCI support"
|
||
|
|
default n
|
||
|
|
depends on 64BIT
|
||
|
|
- select ARCH_SUPPORTS_MSI
|
||
|
|
select PCI_MSI
|
||
|
|
help
|
||
|
|
Enable PCI support.
|
||
|
|
--- a/arch/sparc/Kconfig
|
||
|
|
+++ b/arch/sparc/Kconfig
|
||
|
|
@@ -52,7 +52,6 @@ config SPARC32
|
||
|
|
|
||
|
|
config SPARC64
|
||
|
|
def_bool 64BIT
|
||
|
|
- select ARCH_SUPPORTS_MSI
|
||
|
|
select HAVE_FUNCTION_TRACER
|
||
|
|
select HAVE_FUNCTION_GRAPH_TRACER
|
||
|
|
select HAVE_FUNCTION_GRAPH_FP_TEST
|
||
|
|
--- a/arch/tile/Kconfig
|
||
|
|
+++ b/arch/tile/Kconfig
|
||
|
|
@@ -379,7 +379,6 @@ config PCI
|
||
|
|
select PCI_DOMAINS
|
||
|
|
select GENERIC_PCI_IOMAP
|
||
|
|
select TILE_GXIO_TRIO if TILEGX
|
||
|
|
- select ARCH_SUPPORTS_MSI if TILEGX
|
||
|
|
select PCI_MSI if TILEGX
|
||
|
|
---help---
|
||
|
|
Enable PCI root complex support, so PCIe endpoint devices can
|
||
|
|
--- a/arch/x86/Kconfig
|
||
|
|
+++ b/arch/x86/Kconfig
|
||
|
|
@@ -1999,7 +1999,6 @@ menu "Bus options (PCI etc.)"
|
||
|
|
config PCI
|
||
|
|
bool "PCI support"
|
||
|
|
default y
|
||
|
|
- select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)
|
||
|
|
---help---
|
||
|
|
Find out whether you have a PCI motherboard. PCI is the name of a
|
||
|
|
bus system, i.e. the way the CPU talks to the other stuff inside
|
||
|
|
--- a/drivers/pci/Kconfig
|
||
|
|
+++ b/drivers/pci/Kconfig
|
||
|
|
@@ -1,13 +1,9 @@
|
||
|
|
#
|
||
|
|
# PCI configuration
|
||
|
|
#
|
||
|
|
-config ARCH_SUPPORTS_MSI
|
||
|
|
- bool
|
||
|
|
-
|
||
|
|
config PCI_MSI
|
||
|
|
bool "Message Signaled Interrupts (MSI and MSI-X)"
|
||
|
|
depends on PCI
|
||
|
|
- depends on ARCH_SUPPORTS_MSI
|
||
|
|
help
|
||
|
|
This allows device drivers to enable MSI (Message Signaled
|
||
|
|
Interrupts). Message Signaled Interrupts enable a device to
|