During suspend, PCIe bridges with downstream devices are transitioned into a low power state (D3hot or D3cold) depending on platform capabilities. However, during hibernate, these bridges remain in D0, which can lead to unnecessary power consumption.
Align the hibernate flow with suspend by updating pci_pm_poweroff_noirq() to use pci_pm_suspend_noirq_common(). This ensures that PCIe bridges with active downstream devices are properly transitioned to a low power state during hibernate. This change introduces a functional update: the hibernate path will now invoke pci_save_state(), and — unless bus-level power management is skipped — will transition the bridge into D3hot or D3cold as appropriate. Cc: AceLan Kao <acelan....@canonical.com> Cc: Kai-Heng Feng <kaihe...@nvidia.com> Cc: Mark Pearson <mpearson-len...@squebb.ca> Cc: Denis Benato <benato.deni...@gmail.com> Cc: Merthan Karakaş <m3rth...@gmail.com> Tested-by: Eric Naim <dn...@cachyos.org> Signed-off-by: Mario Limonciello (AMD) <supe...@kernel.org> --- v7: * reword commit text v6: * s/port/bridge/ v5: * Split out into more patches * Rewrite commit * Add tag v4: * Use helper even when CONFIG_SUSPEND not set (LKP robot) * https://lore.kernel.org/linux-pci/20250616175019.3471583-1-supe...@kernel.org/ v3: * Split out common code between suspend_noirq() and poweroff_noirq() to a helper function * https://lore.kernel.org/linux-pm/20250609024619.407257-1-supe...@kernel.org/T/#me6db0fb946e3d604a8f3d455128844ed802c82bb --- drivers/pci/pci-driver.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index c563fd6af979d..5eedfbb0be8a4 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -762,7 +762,7 @@ static void pci_pm_complete(struct device *dev) #endif /* !CONFIG_PM_SLEEP */ -#if defined(CONFIG_SUSPEND) +#if defined(CONFIG_SUSPEND) || defined(CONFIG_HIBERNATE_CALLBACKS) /** * pci_pm_suspend_noirq_common * @pci_dev: pci device @@ -808,7 +808,7 @@ static void pci_pm_suspend_noirq_common(struct pci_dev *pci_dev, bool *skip_bus_ pci_pm_set_unknown_state(pci_dev); } -#endif /* CONFIG_SUSPEND */ +#endif /* CONFIG_SUSPEND || CONFIG_HIBERNATE_CALLBACKS */ #ifdef CONFIG_SUSPEND static void pcie_pme_root_status_cleanup(struct pci_dev *pci_dev) @@ -1164,6 +1164,8 @@ static int pci_pm_poweroff(struct device *dev) (system_state == SYSTEM_HALT || system_state == SYSTEM_POWER_OFF)) device_set_wakeup_enable(dev, false); + pci_dev->skip_bus_pm = false; + if (pci_has_legacy_pm_support(pci_dev)) return pci_legacy_suspend(dev, PMSG_HIBERNATE); @@ -1206,6 +1208,7 @@ static int pci_pm_poweroff_noirq(struct device *dev) { struct pci_dev *pci_dev = to_pci_dev(dev); const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; + bool skip_bus_pm = false; if (dev_pm_skip_suspend(dev)) return 0; @@ -1227,8 +1230,9 @@ static int pci_pm_poweroff_noirq(struct device *dev) return error; } - if (!pci_dev->state_saved && pci_power_manageable(pci_dev)) - pci_prepare_to_sleep(pci_dev); + pci_pm_suspend_noirq_common(pci_dev, &skip_bus_pm); + if (skip_bus_pm) + goto Fixup; /* * The reason for doing this here is the same as for the analogous code @@ -1237,6 +1241,7 @@ static int pci_pm_poweroff_noirq(struct device *dev) if (pci_dev->class == PCI_CLASS_SERIAL_USB_EHCI) pci_write_config_word(pci_dev, PCI_COMMAND, 0); +Fixup: pci_fixup_device(pci_fixup_suspend_late, pci_dev); return 0; -- 2.43.0
