PCI: Unify ACPI and DT 'preserve config' support

Vidya Sagar · bjorn-helgaas · commit 1e6922482cd4 · 2024-06-03T16:17:49.000-05:00
Unify the 'preserve config' support across ACPI and device-tree boot flows. Link: https://lore.kernel.org/r/20240508174138.3630283-4-vidyas@nvidia.com Signed-off-by: Vidya Sagar <vidyas@nvidia.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
@@ -894,6 +894,9 @@ static bool pci_preserve_config(struct pci_host_bridge *host_bridge)
 	if (pci_acpi_preserve_config(host_bridge))
 		return true;
 
+	if (host_bridge->dev.parent && host_bridge->dev.parent->of_node)
+		return of_pci_preserve_config(host_bridge->dev.parent->of_node);
+
 	return false;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -894,6 +894,9 @@ static bool pci_preserve_config(struct pci_host_bridge *host_bridge)`
`894`	`894`	`if (pci_acpi_preserve_config(host_bridge))`
`895`	`895`	`return true;`
`896`	`896`
	`897`	`+ if (host_bridge->dev.parent && host_bridge->dev.parent->of_node)`
	`898`	`+ return of_pci_preserve_config(host_bridge->dev.parent->of_node);`
	`899`	`+`
`897`	`900`	`return false;`
`898`	`901`	`}`
`899`	`902`