Commit 4a5954ed authored May 03, 2016 by Gavin Shan Committed by Michael Ellerman May 11, 2016

powerpc/pci: Don't scan empty slot



In hotplug case, function pci_add_pci_devices() is called to rescan
the specified PCI bus, which might not have any child devices. Access
to the PCI bus's child device node will cause kernel crash without
exception.

This adds one more check to skip scanning PCI bus that doesn't have
any subordinate devices from device-tree, in order to avoid kernel
crash.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent cdddc577

arch/powerpc/kernel/pci-hotplug.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,8 @@ void pci_hp_add_devices(struct pci_bus *bus)
		if (mode == PCI_PROBE_DEVTREE) {
		/* use ofdt-based probe */
		of_rescan_bus(dn, bus);
		} else if (mode == PCI_PROBE_NORMAL) {
		} else if (mode == PCI_PROBE_NORMAL &&
		dn->child && PCI_DN(dn->child)) {
		/*
		* Use legacy probe. In the partial hotplug case, we
		* probably have grandchildren devices unplugged. So

Admin message