From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B03D1396572; Mon, 27 Apr 2026 20:50:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777323041; cv=none; b=RgoeM1h+fNj5C7ea9QUtxlyKRrOwBxZuF+GsyfzYrBnuunqO03MljTkQMfA92UrwOBe6MuHfH4lRwX80iR7nCt7QAUoYqaEnb8EHTuCzKIjwkcoc832IYq/Py3zeCBlF39GyMJGeaFH7sRLEkGoaV7ddYmImuvef2jxS9kVbgxo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777323041; c=relaxed/simple; bh=GL8H8BY8NRdrAifAmpTwvjzlZwOl3aZ/5ExlC2X7Y10=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IaTTFrcy1yIhhnTXO1UZyLoiuRsOfiWTwd849vuw9qZazJGpwIx9n9+HnYKulmICP94IT4bJkF+3rbuMz6AuMuvSFzmI7/HU28ERFy9Q//dTWiODpbxIbqV7csNMklCSdMC+tg3Zfq51A8l/G4OeimyL6kBfv84LXb9JmJ5IBEY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IRboP7d8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IRboP7d8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80F03C19425; Mon, 27 Apr 2026 20:50:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777323039; bh=GL8H8BY8NRdrAifAmpTwvjzlZwOl3aZ/5ExlC2X7Y10=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IRboP7d8Yrhhg0Vg5CxvWgGagfQDDHkS9ZvYjSQQUeWS/wL/j6dV2GX5+XeYqOeBx 6FBJReX/fo5H6H9WIxCo5CE9dza5JfUcOYCb2hJWPBvm1LvmHOYO199zaAZzjBzcJ8 /xHlfm3rdQqDIDDf8Kty1+iei8mgsgTqzuwtMWLzGDR0Y83cCtgEu47ucJqCnKoGWd KaRnHfOCckc2xU/qW86o8n+zOPwbQOeMo7/wTERfv0V+/WFRNcssfOwWYC34/O4KgY WHX5XIh8MWnYHVj6sCyNiZsxlyYePu1jRuKMfTrHJrGOnNB8ftkykhne0fVgQxcIX7 KliHMShZPYGMA== From: "Mario Limonciello (AMD)" To: Bjorn Helgaas , linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM) Cc: linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM), linux-kernel@vger.kernel.org (open list), "Rafael J . Wysocki" , Lukas Wunner , linux-pm@vger.kernel.org, "Mario Limonciello (AMD)" , AceLan Kao , Kai-Heng Feng , Mark Pearson , Denis Benato , =?UTF-8?q?Merthan=20Karaka=C5=9F?= , Eric Naim Subject: [PATCH v2 6/6] PCI: Put PCIe bridges with downstream devices into D3 at hibernate Date: Mon, 27 Apr 2026 15:50:24 -0500 Message-ID: <20260427205024.254677-7-superm1@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260427205024.254677-1-superm1@kernel.org> References: <20260427205024.254677-1-superm1@kernel.org> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Cc: Kai-Heng Feng Cc: Mark Pearson Cc: Denis Benato Cc: Merthan Karakaş Tested-by: Eric Naim Signed-off-by: Mario Limonciello (AMD) --- 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 3c82d818ee15b..50eca518493b8 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -788,7 +788,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 @@ -834,7 +834,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) @@ -1191,6 +1191,8 @@ static int pci_pm_poweroff(struct device *dev) if (device_may_wakeup(dev) && 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); @@ -1233,6 +1235,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; @@ -1254,8 +1257,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 @@ -1264,6 +1268,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.53.0