diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2025-03-27 13:14:44 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2025-03-27 13:14:44 -0500 |
| commit | e91c25c6fca81949d215f4009a8faac8c0308999 (patch) | |
| tree | 9a3b702f310d31e06c31c0bc13e912a67fd3001d | |
| parent | 655ea930fe218775d8fcb5c539ca176363c755b3 (diff) | |
| parent | a5fb3ff632876d63ee1fc5ed3af2464240145a00 (diff) | |
Merge branch 'pci/pm'
- Allow PCI bridges to go to D3Hot on all non-x86 systems (Manivannan
Sadhasivam)
* pci/pm:
PCI: Allow PCI bridges to go to D3Hot on all non-x86
| -rw-r--r-- | drivers/pci/pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index f869f4c1a293..c24b01f7fad5 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3031,7 +3031,7 @@ static const struct dmi_system_id bridge_d3_blacklist[] = { * @bridge: Bridge to check * * This function checks if it is possible to move the bridge to D3. - * Currently we only allow D3 for recent enough PCIe ports and Thunderbolt. + * Currently we only allow D3 for some PCIe ports and for Thunderbolt. */ bool pci_bridge_d3_possible(struct pci_dev *bridge) { @@ -3075,10 +3075,10 @@ bool pci_bridge_d3_possible(struct pci_dev *bridge) return false; /* - * It should be safe to put PCIe ports from 2015 or newer - * to D3. + * Out of caution, we only allow PCIe ports from 2015 or newer + * into D3 on x86. */ - if (dmi_get_bios_year() >= 2015) + if (!IS_ENABLED(CONFIG_X86) || dmi_get_bios_year() >= 2015) return true; break; } |