If pci_d3cold_enable() or pci_d3cold_disable() is called on a root
port it is ignored because there is no upstream bridge.
If called on a root port, use `no_d3cold` variable to decide policy
and also immediately refresh whether D3 is possible.
Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
---
Changes from RFC v1:
* New patch
---
drivers/pci/pci.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 8c5a6f68f63d..28f70e8ea478 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -3021,6 +3021,9 @@ bool pci_bridge_d3_possible(struct pci_dev *bridge)
if (pci_bridge_d3_disable)
return false;
+ if (bridge->no_d3cold)
+ return false;
+
/*
* Hotplug ports handled by firmware in System Management Mode
* may not be put into D3 by the OS (Thunderbolt on non-Macs).
@@ -3096,7 +3099,11 @@ void pci_bridge_d3_update(struct pci_dev *dev)
bool d3cold_ok = true;
bridge = pci_upstream_bridge(dev);
- if (!bridge || !pci_bridge_d3_possible(bridge))
+ if (!bridge) {
+ dev->bridge_d3 = pci_bridge_d3_possible(dev);
+ return;
+ }
+ if (!pci_bridge_d3_possible(bridge))
return;
/*
--
2.34.1
