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

Commit 04613617 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

MIPS/PCI: 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.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent b30742aa
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -112,7 +112,14 @@ static void pcibios_scanbus(struct pci_controller *hose)
		need_domain_info = 1;
	}

	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);
	}