Browse Source

powerpc/pseries: Make PCI non-optional

The pseries build with PCI=n looks to have been broken for at least 5
years, and no one's noticed or cared.

Following the obvious breakages backward, the first commit I can find
that builds is the parent of 2eb4afb69ff3 ("powerpc/pci: Move pseries
code into pseries platform specific area") from April 2009.

A distro would never ship a PCI=n kernel, so it is only useful for folks
building custom kernels. Also on KVM the virtio devices appear on PCI,
so it would only be useful if you were building kernels specifically to
run on PowerVM and with no PCI devices.

The added code complexity, and testing load (which we've clearly not
been doing), is not justified by the small reduction in kernel size for
such a niche use case.

So just make PCI non-optional on pseries.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Michael Ellerman 10 years ago
parent
commit
4c9cd468b3
1 changed files with 1 additions and 1 deletions
  1. 1 1
      arch/powerpc/platforms/pseries/Kconfig

+ 1 - 1
arch/powerpc/platforms/pseries/Kconfig

@@ -4,6 +4,7 @@ config PPC_PSERIES
 	select HAVE_PCSPKR_PLATFORM
 	select HAVE_PCSPKR_PLATFORM
 	select MPIC
 	select MPIC
 	select OF_DYNAMIC
 	select OF_DYNAMIC
+	select PCI
 	select PCI_MSI
 	select PCI_MSI
 	select PPC_XICS
 	select PPC_XICS
 	select PPC_ICP_NATIVE
 	select PPC_ICP_NATIVE
@@ -15,7 +16,6 @@ config PPC_PSERIES
 	select RTAS_ERROR_LOGGING
 	select RTAS_ERROR_LOGGING
 	select PPC_UDBG_16550
 	select PPC_UDBG_16550
 	select PPC_NATIVE
 	select PPC_NATIVE
-	select PPC_PCI_CHOICE if EXPERT
 	select PPC_DOORBELL
 	select PPC_DOORBELL
 	select HAVE_CONTEXT_TRACKING
 	select HAVE_CONTEXT_TRACKING
 	select HOTPLUG_CPU if SMP
 	select HOTPLUG_CPU if SMP