mvebu: backport mainline patches from kernel 3.12
[openwrt/staging/wigyori.git] / target / linux / mvebu / patches-3.10 / 0071-PCI-remove-ARCH_SUPPORTS_MSI-kconfig-option.patch
1 From c819a1b0907257d73de96af33d557668a5c0c895 Mon Sep 17 00:00:00 2001
2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3 Date: Mon, 1 Jul 2013 14:26:57 +0200
4 Subject: [PATCH 071/203] PCI: remove ARCH_SUPPORTS_MSI kconfig option
5
6 Now that we have weak versions for each of the PCI MSI architecture
7 functions, we can actually build the MSI support for all platforms,
8 regardless of whether they provide or not architecture-specific
9 versions of those functions. For this reason, the ARCH_SUPPORTS_MSI
10 hidden kconfig boolean becomes useless, and this patch gets rid of it.
11
12 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
13 Acked-by: Bjorn Helgaas <bhelgaas@google.com>
14 Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
15 Tested-by: Daniel Price <daniel.price@gmail.com>
16 Tested-by: Thierry Reding <thierry.reding@gmail.com>
17 Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
18 Cc: Paul Mackerras <paulus@samba.org>
19 Cc: linuxppc-dev@lists.ozlabs.org
20 Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
21 Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
22 Cc: linux390@de.ibm.com
23 Cc: linux-s390@vger.kernel.org
24 Cc: Thomas Gleixner <tglx@linutronix.de>
25 Cc: Ingo Molnar <mingo@redhat.com>
26 Cc: H. Peter Anvin <hpa@zytor.com>
27 Cc: x86@kernel.org
28 Cc: Russell King <linux@arm.linux.org.uk>
29 Cc: Tony Luck <tony.luck@intel.com>
30 Cc: Fenghua Yu <fenghua.yu@intel.com>
31 Cc: linux-ia64@vger.kernel.org
32 Cc: Ralf Baechle <ralf@linux-mips.org>
33 Cc: linux-mips@linux-mips.org
34 Cc: David S. Miller <davem@davemloft.net>
35 Cc: sparclinux@vger.kernel.org
36 Cc: Chris Metcalf <cmetcalf@tilera.com>
37 ---
38 arch/arm/Kconfig | 1 -
39 arch/ia64/Kconfig | 1 -
40 arch/mips/Kconfig | 2 --
41 arch/powerpc/Kconfig | 1 -
42 arch/s390/Kconfig | 1 -
43 arch/sparc/Kconfig | 1 -
44 arch/tile/Kconfig | 1 -
45 arch/x86/Kconfig | 1 -
46 drivers/pci/Kconfig | 4 ----
47 9 files changed, 13 deletions(-)
48
49 --- a/arch/arm/Kconfig
50 +++ b/arch/arm/Kconfig
51 @@ -435,7 +435,6 @@ config ARCH_NETX
52 config ARCH_IOP13XX
53 bool "IOP13xx-based"
54 depends on MMU
55 - select ARCH_SUPPORTS_MSI
56 select CPU_XSC3
57 select NEED_MACH_MEMORY_H
58 select NEED_RET_TO_USER
59 --- a/arch/ia64/Kconfig
60 +++ b/arch/ia64/Kconfig
61 @@ -9,7 +9,6 @@ config IA64
62 select PCI if (!IA64_HP_SIM)
63 select ACPI if (!IA64_HP_SIM)
64 select PM if (!IA64_HP_SIM)
65 - select ARCH_SUPPORTS_MSI
66 select HAVE_UNSTABLE_SCHED_CLOCK
67 select HAVE_IDE
68 select HAVE_OPROFILE
69 --- a/arch/mips/Kconfig
70 +++ b/arch/mips/Kconfig
71 @@ -764,7 +764,6 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
72 select SYS_HAS_CPU_CAVIUM_OCTEON
73 select SWAP_IO_SPACE
74 select HW_HAS_PCI
75 - select ARCH_SUPPORTS_MSI
76 select ZONE_DMA32
77 select USB_ARCH_HAS_OHCI
78 select USB_ARCH_HAS_EHCI
79 @@ -800,7 +799,6 @@ config NLM_XLR_BOARD
80 select CEVT_R4K
81 select CSRC_R4K
82 select IRQ_CPU
83 - select ARCH_SUPPORTS_MSI
84 select ZONE_DMA32 if 64BIT
85 select SYNC_R4K
86 select SYS_HAS_EARLY_PRINTK
87 --- a/arch/powerpc/Kconfig
88 +++ b/arch/powerpc/Kconfig
89 @@ -734,7 +734,6 @@ config PCI
90 default y if !40x && !CPM2 && !8xx && !PPC_83xx \
91 && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON
92 default PCI_QSPAN if !4xx && !CPM2 && 8xx
93 - select ARCH_SUPPORTS_MSI
94 select GENERIC_PCI_IOMAP
95 help
96 Find out whether your system includes a PCI bus. PCI is the name of
97 --- a/arch/s390/Kconfig
98 +++ b/arch/s390/Kconfig
99 @@ -430,7 +430,6 @@ menuconfig PCI
100 bool "PCI support"
101 default n
102 depends on 64BIT
103 - select ARCH_SUPPORTS_MSI
104 select PCI_MSI
105 help
106 Enable PCI support.
107 --- a/arch/sparc/Kconfig
108 +++ b/arch/sparc/Kconfig
109 @@ -52,7 +52,6 @@ config SPARC32
110
111 config SPARC64
112 def_bool 64BIT
113 - select ARCH_SUPPORTS_MSI
114 select HAVE_FUNCTION_TRACER
115 select HAVE_FUNCTION_GRAPH_TRACER
116 select HAVE_FUNCTION_GRAPH_FP_TEST
117 --- a/arch/tile/Kconfig
118 +++ b/arch/tile/Kconfig
119 @@ -379,7 +379,6 @@ config PCI
120 select PCI_DOMAINS
121 select GENERIC_PCI_IOMAP
122 select TILE_GXIO_TRIO if TILEGX
123 - select ARCH_SUPPORTS_MSI if TILEGX
124 select PCI_MSI if TILEGX
125 ---help---
126 Enable PCI root complex support, so PCIe endpoint devices can
127 --- a/arch/x86/Kconfig
128 +++ b/arch/x86/Kconfig
129 @@ -1999,7 +1999,6 @@ menu "Bus options (PCI etc.)"
130 config PCI
131 bool "PCI support"
132 default y
133 - select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)
134 ---help---
135 Find out whether you have a PCI motherboard. PCI is the name of a
136 bus system, i.e. the way the CPU talks to the other stuff inside
137 --- a/drivers/pci/Kconfig
138 +++ b/drivers/pci/Kconfig
139 @@ -1,13 +1,9 @@
140 #
141 # PCI configuration
142 #
143 -config ARCH_SUPPORTS_MSI
144 - bool
145 -
146 config PCI_MSI
147 bool "Message Signaled Interrupts (MSI and MSI-X)"
148 depends on PCI
149 - depends on ARCH_SUPPORTS_MSI
150 help
151 This allows device drivers to enable MSI (Message Signaled
152 Interrupts). Message Signaled Interrupts enable a device to