Merge branch 'pci/pm'

- Allow D3 for native hotplug-capable Root Ports on non-x86 platforms (we
  avoid D3 for these ports on x86 because some old platforms didn't
  validate it) (Manivannan Sadhasivam)

* pci/pm:
  PCI: Allow D3 for native hotplug-capable Root Ports on non-x86 platforms
This commit is contained in:
Bjorn Helgaas
2026-08-21 16:40:35 -05:00

View File

@@ -3020,11 +3020,11 @@ bool pci_bridge_d3_possible(struct pci_dev *bridge)
return true;
/*
* Hotplug ports handled natively by the OS were not validated
* by vendors for runtime D3 at least until 2018 because there
* was no OS support.
* Hotplug ports handled natively by the OS on x86 platforms
* were not validated by vendors for runtime D3 at least until
* 2018 because there was no OS support.
*/
if (bridge->is_pciehp)
if (IS_ENABLED(CONFIG_X86) && bridge->is_pciehp)
return false;
if (dmi_check_system(bridge_d3_blacklist))