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

Commit 85dc0413 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Bjorn Helgaas
Browse files

arm64: PCI: Preserve firmware configuration when desired 

If we must preserve the firmware resource assignments, claim the existing
resources rather than reassigning everything.

Link: https://lore.kernel.org/r/20190615002359.29577-4-benh@kernel.crashing.org


Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
[bhelgaas: commit log]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
parent 3e8ba968

arch/arm64/kernel/pci.c

+10 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
	struct acpi_pci_generic_root_info *ri;

	struct pci_bus *bus, *child;

	struct acpi_pci_root_ops *root_ops;

	struct pci_host_bridge *host;



	ri = kzalloc(sizeof(*ri), GFP_KERNEL);

	if (!ri)
@@ -193,6 +194,15 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
	if (!bus)

		return NULL;



	/* If we must preserve the resource configuration, claim now */

	host = pci_find_host_bridge(bus);

	if (host->preserve_config)

		pci_bus_claim_resources(bus);



	/*

	 * Assign whatever was left unassigned. If we didn't claim above,

	 * this will reassign everything.

	 */

	pci_assign_unassigned_root_bus_resources(bus);



	list_for_each_entry(child, &bus->children, node)