Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+21
-8
+7
-1
arch/arm/Kconfig
+7
-1
arch/arm/Kconfig
···
1245
1245
VESA. If you have PCI, say Y, otherwise N.
1246
1246
1247
1247
config PCI_DOMAINS
1248
-
bool
1248
+
bool "Support for multiple PCI domains"
1249
1249
depends on PCI
1250
+
help
1251
+
Enable PCI domains kernel management. Say Y if your machine
1252
+
has a PCI bus hierarchy that requires more than one PCI
1253
+
domain (aka segment) to be correctly managed. Say N otherwise.
1254
+
1255
+
If you don't know what to do here, say N.
1250
1256
1251
1257
config PCI_DOMAINS_GENERIC
1252
1258
def_bool PCI_DOMAINS
+1
arch/arm/mach-bcm/Kconfig
+1
arch/arm/mach-bcm/Kconfig
+1
arch/arm/mach-socfpga/Kconfig
+1
arch/arm/mach-socfpga/Kconfig
+3
-3
drivers/pci/Makefile
+3
-3
drivers/pci/Makefile
···
28
28
obj-$(CONFIG_PCI_ECAM) += ecam.o
29
29
obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o
30
30
31
-
obj-y += controller/
32
-
obj-y += switch/
33
-
34
31
# Endpoint library must be initialized before its users
35
32
obj-$(CONFIG_PCI_ENDPOINT) += endpoint/
33
+
34
+
obj-y += controller/
35
+
obj-y += switch/
36
36
37
37
ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG
-3
drivers/pci/controller/Kconfig
-3
drivers/pci/controller/Kconfig
···
96
96
depends on OF
97
97
select PCI_HOST_COMMON
98
98
select IRQ_DOMAIN
99
-
select PCI_DOMAINS
100
99
help
101
100
Say Y here if you want to support a simple generic PCI host
102
101
controller, such as the one emulated by kvmtool.
···
137
138
138
139
config PCIE_IPROC
139
140
tristate
140
-
select PCI_DOMAINS
141
141
help
142
142
This enables the iProc PCIe core controller support for Broadcom's
143
143
iProc family of SoCs. An appropriate bus interface driver needs
···
174
176
config PCIE_ALTERA
175
177
bool "Altera PCIe controller"
176
178
depends on ARM || NIOS2 || COMPILE_TEST
177
-
select PCI_DOMAINS
178
179
help
179
180
Say Y here if you want to enable PCIe controller support on Altera
180
181
FPGA.
+9
-1
drivers/pci/hotplug/acpi_pcihp.c
+9
-1
drivers/pci/hotplug/acpi_pcihp.c
···
7
7
* All rights reserved.
8
8
*
9
9
* Send feedback to <kristen.c.accardi@intel.com>
10
-
*
11
10
*/
12
11
13
12
#include <linux/module.h>
···
86
87
return 0;
87
88
88
89
/* If _OSC exists, we should not evaluate OSHP */
90
+
91
+
/*
92
+
* If there's no ACPI host bridge (i.e., ACPI support is compiled
93
+
* into the kernel but the hardware platform doesn't support ACPI),
94
+
* there's nothing to do here.
95
+
*/
89
96
host = pci_find_host_bridge(pdev->bus);
90
97
root = acpi_pci_find_root(ACPI_HANDLE(&host->dev));
98
+
if (!root)
99
+
return 0;
100
+
91
101
if (root->osc_support_set)
92
102
goto no_control;
93
103