shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: Revert "PCI: Use preserve_config in place of pci_flags"

Browse Source 
This reverts commit f858b0fab2 which is
commit 7246a4520b4bf1494d7d030166a11b5226f6d508 upstream.

This patch causes a regression in cuttlefish/crossvm boot on arm64.

The patch was part of a series that when applied will not cause a regression
but this patch was backported to the 6.1 branch by itself.

The other patches do not apply cleanly to the 6.1 branch.

Change-Id: Ic43827b09479ce94cba23f9621f1afefa743cf91
Signed-off-by: Terry Tritton <terry.tritton@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 479a42eedb)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Terry Tritton
2025-01-17 15:16:39 +00:00
committed by Greg Kroah-Hartman
parent 34aea58089
commit 1ffc24e7e8
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pci/controller/pci-host-common.c
View File

@@ -73,6 +73,10 @@ int pci_host_common_probe(struct platform_device *pdev)
if (IS_ERR(cfg)) if (IS_ERR(cfg))
return PTR_ERR(cfg); return PTR_ERR(cfg);
/* Do not reassign resources if probe only */
if (!pci_has_flag(PCI_PROBE_ONLY))
pci_add_flags(PCI_REASSIGN_ALL_BUS);
bridge->sysdata = cfg; bridge->sysdata = cfg;
bridge->ops = (struct pci_ops *)&ops->pci_ops; bridge->ops = (struct pci_ops *)&ops->pci_ops;
bridge->msi_domain = true; bridge->msi_domain = true;

20
drivers/pci/probe.c
View File

@@ -3075,18 +3075,20 @@ int pci_host_probe(struct pci_host_bridge *bridge)
bus = bridge->bus; bus = bridge->bus;
/* If we must preserve the resource configuration, claim now */
if (bridge->preserve_config)
pci_bus_claim_resources(bus);
/* /*
* Assign whatever was left unassigned. If we didn't claim above, * We insert PCI resources into the iomem_resource and
* this will reassign everything. * ioport_resource trees in either pci_bus_claim_resources()
* or pci_bus_assign_resources().
*/ */
pci_assign_unassigned_root_bus_resources(bus); if (pci_has_flag(PCI_PROBE_ONLY)) {
pci_bus_claim_resources(bus);
} else {
pci_bus_size_bridges(bus);
pci_bus_assign_resources(bus);
list_for_each_entry(child, &bus->children, node) list_for_each_entry(child, &bus->children, node)
pcie_bus_configure_settings(child); pcie_bus_configure_settings(child);
}
pci_bus_add_devices(bus); pci_bus_add_devices(bus);
return 0; return 0;