Commit dcce0f15 authored Jun 08, 2016 by Lorenzo Pieralisi Committed by Bjorn Helgaas Jun 23, 2016

PCI: generic: Claim bus resources on PCI_PROBE_ONLY set-ups



We claim PCI BAR and bridge window resources in pci_bus_assign_resources(),
but when PCI_PROBE_ONLY is set, we treat those resources as immutable and
don't call pci_bus_assign_resources(), so the resources aren't put in the
resource tree.

When the resources aren't in the tree, they don't show up in /proc/iomem,
we can't detect conflicts, and we need special cases elsewhere for
PCI_PROBE_ONLY or resources without a parent pointer.

Claim all PCI BAR and window resources in the PCI_PROBE_ONLY case.

If a PCI_PROBE_ONLY platform assigns conflicting resources, Linux can't fix
the conflicts.  Previously we didn't notice the conflicts, but now we will,
which may expose new failures.

[bhelgaas: changelog, summarize comment]
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Will Deacon <will.deacon@arm.com>
CC: Arnd Bergmann <arnd@arndb.de>
CC: David Daney <david.daney@cavium.com>

parent 765bf9b7

drivers/pci/host/pci-host-common.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -155,7 +155,14 @@ int pci_host_common_probe(struct platform_device *pdev,

		pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);

		if (!pci_has_flag(PCI_PROBE_ONLY)) {
		/*
		* We insert PCI resources into the iomem_resource and
		* ioport_resource trees in either pci_bus_claim_resources()
		* or pci_bus_assign_resources().
		*/
		if (pci_has_flag(PCI_PROBE_ONLY)) {
		pci_bus_claim_resources(bus);
		} else {
		pci_bus_size_bridges(bus);
		pci_bus_assign_resources(bus);