Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd993fc4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v4.18-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fixes from Bjorn Helgaas:

 - Fix crash caused by endpoint library initialization order change
   (Alan Douglas)

 - Fix shpchp NULL pointer dereference regression on non-ACPI platforms
   (Bjorn Helgaas)

 - Move PCI_DOMAINS selection to fix build regression (Lorenzo
   Pieralisi)

* tag 'pci-v4.18-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: controller: Move PCI_DOMAINS selection to arch Kconfig
  PCI: Initialize endpoint library before controllers
  PCI: shpchp: Manage SHPC unconditionally on non-ACPI systems
parents 5e4e8c55 925d3166

arch/arm/Kconfig

+7 −1
Original line number Diff line number Diff line
@@ -1245,8 +1245,14 @@ config PCI 
	  VESA. If you have PCI, say Y, otherwise N.



config PCI_DOMAINS

	bool

	bool "Support for multiple PCI domains"

	depends on PCI

	help

	  Enable PCI domains kernel management. Say Y if your machine

	  has a PCI bus hierarchy that requires more than one PCI

	  domain (aka segment) to be correctly managed. Say N otherwise.



	  If you don't know what to do here, say N.



config PCI_DOMAINS_GENERIC

	def_bool PCI_DOMAINS

arch/arm/mach-bcm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ config ARCH_BCM_IPROC 
	select GPIOLIB

	select ARM_AMBA

	select PINCTRL

	select PCI_DOMAINS if PCI

	help

	  This enables support for systems based on Broadcom IPROC architected SoCs.

	  The IPROC complex contains one or more ARM CPUs along with common

arch/arm/mach-socfpga/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ menuconfig ARCH_SOCFPGA 
	select HAVE_ARM_SCU

	select HAVE_ARM_TWD if SMP

	select MFD_SYSCON

	select PCI_DOMAINS if PCI



if ARCH_SOCFPGA

config SOCFPGA_SUSPEND

drivers/pci/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ obj-$(CONFIG_PCI_PF_STUB) += pci-pf-stub.o 
obj-$(CONFIG_PCI_ECAM)		+= ecam.o

obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o



obj-y				+= controller/

obj-y				+= switch/



# Endpoint library must be initialized before its users

obj-$(CONFIG_PCI_ENDPOINT)	+= endpoint/



obj-y				+= controller/

obj-y				+= switch/



ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG

drivers/pci/controller/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ config PCI_HOST_GENERIC 
	depends on OF

	select PCI_HOST_COMMON

	select IRQ_DOMAIN

	select PCI_DOMAINS

	help

	  Say Y here if you want to support a simple generic PCI host

	  controller, such as the one emulated by kvmtool.
@@ -138,7 +137,6 @@ config PCI_VERSATILE 


config PCIE_IPROC

	tristate

	select PCI_DOMAINS

	help

	  This enables the iProc PCIe core controller support for Broadcom's

	  iProc family of SoCs. An appropriate bus interface driver needs
@@ -176,7 +174,6 @@ config PCIE_IPROC_MSI 
config PCIE_ALTERA

	bool "Altera PCIe controller"

	depends on ARM || NIOS2 || COMPILE_TEST

	select PCI_DOMAINS

	help

	  Say Y here if you want to enable PCIe controller support on Altera

	  FPGA.