From nobody Fri Sep 25 04:08:50 2026 Received: from BN8PR05CU002.outbound.protection.outlook.com (mail-eastus2azon11011047.outbound.protection.outlook.com [52.101.57.47]) (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 A020F4E430C; Wed, 16 Sep 2026 20:54:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.57.47 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789592084; cv=fail; b=cYo42VrwP9Xl2uaDGpoyj8IzJqhFIkWQj7UpheQUKO8znv3d9rttVGzwMzpgbqWfBw2aXHN0QyVI4zCtdYsvKNDPn3ppz/UHERg3EQnrKGxsQUyYO1AE1WU3A0Zo1t5b9yR35N+uQRbWC5ePFd+TfBJqBjSELmG6DUmUSbTPU8I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789592084; c=relaxed/simple; bh=qq3AFeOIaTOQ3MpJQKX5fjZhCUHlhcKRGvYPfO0L3MU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jc3Mc1N5aRkSVvuxi0Czy2ap0vyVFsoC/MUNwJCwVI/0GTG5B9X5hLZFLGv4yFupmBegsmIAHlbsqOaoI1z3BhLSXV6UweZVic59ypLU40a+wOkrD20tqEAO8p4GBJiGrWTidgj8vY16bPp2K7I5RbNTEjb3JBo6lf/k7YmurO4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=XmFMzfIe; arc=fail smtp.client-ip=52.101.57.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="XmFMzfIe" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XPyUvZZscn02RrHDG1IR2pQuzboY2qDZVmyb6I3cSpYrO3aUlEZhhsk1ox/Zlmwj8trMo4P9Mz9Kuc2B25oWKLM0zrGf+n4Cj8mJEsYqROfIF+rIhfrA4iK941D+KVWV6tEwVdkeR0gkhudRNRgq0saBnIkvdCvHDL/Y/iqEwFqrZHUe7Pq8AKJgGsKNSWuNvez+8cZdKsn0OgO1IbcFnxtXIncvhwxsE2BTnQmrjX4g24gWjV6Dh0xfSMOipWBkjzYYdI+X4YxT8yQDnZcAbpVxj1HEtxIfLbfaYTE57ibKIKT5jw627PXNDqP/zWrvScZss6FzJn2QT40sWxQ93Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mwkaOtGBfFBzfGQSkXtc1Ds2f3K84fD5x1aBIQTPxrA=; b=pGxt0bnbEJzD4uo6W7QBx9ICVZErV304qti9tKFJtQ2SwqHuGFcA7yOj8rBEq8D8Rr1duwNkwqc3deIxw7FvZQoHboFY29dLQU46UT8628aAUNcyDfS6RySwmftWnLqMG4+xh0uyVPvJEZrubxGIsB/aj1XKWK/iQWU7WJWQzhhTKmHcbL6ziJfd1zIpYCNWZ+oOdOAriL9a4KX/hElGi9e5y+aaNHQCafhPnn3OtPPWa/2Jp25j/cKoisbztzcmYJKVk4Ma2BjRaLNiXv2jEKF8GqX0ywe4atIBam5+z4gQ79X7zVGyp8qhSaGZvPUlPwfWSzLQl2g4jANYE9c39w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=google.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mwkaOtGBfFBzfGQSkXtc1Ds2f3K84fD5x1aBIQTPxrA=; b=XmFMzfIe5Wnq9IADHM6jkj0N07ijGgxrtqVBHTsMZd4gJfITTR6/RR3H+5LvBkCJHDIj4j5OHRuAxqO4yPnLN1RUGJK+z0Q4ADSURHVWc4ww6xcVbqvanvrFQQcnQYBLRijnuzmHKGwccky0xFFc5UGoU3rGlo7swvzvFPCq6GY= Received: from CH0PR03CA0222.namprd03.prod.outlook.com (2603:10b6:610:e7::17) by SA3PR12MB176418.namprd12.prod.outlook.com (2603:10b6:806:513::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.11; Wed, 16 Sep 2026 20:53:55 +0000 Received: from CH1PEPF0000AD7C.namprd04.prod.outlook.com (2603:10b6:610:e7:cafe::3d) by CH0PR03CA0222.outlook.office365.com (2603:10b6:610:e7::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.428.11 via Frontend Transport; Wed, 16 Sep 2026 20:53:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CH1PEPF0000AD7C.mail.protection.outlook.com (10.167.244.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.7 via Frontend Transport; Wed, 16 Sep 2026 20:53:55 +0000 Received: from aus0006770c4n-lx01.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.49; Wed, 16 Sep 2026 15:53:54 -0500 From: Mario Limonciello To: Bjorn Helgaas CC: "open list:PCI SUBSYSTEM" , open list , "Rafael J . Wysocki" , Lukas Wunner , , "Mario Limonciello (AMD)" , Eric Naim Subject: [PATCH v5 1/2] PCI/PM: Split out code from pci_pm_suspend_noirq() into helper Date: Wed, 16 Sep 2026 15:53:39 -0500 Message-ID: <20260916205340.2466679-2-mario.limonciello@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260916205340.2466679-1-mario.limonciello@amd.com> References: <20260916205340.2466679-1-mario.limonciello@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000AD7C:EE_|SA3PR12MB176418:EE_ X-MS-Office365-Filtering-Correlation-Id: 122c55d0-28fb-4ec3-f7c9-08df14349f7b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|23010399003|1800799024|36860700016|10067099003|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: XQK2Lq2oc7+HjAcg2T/djuTV9+PO6Ls3CXQ0JP1ph1uNfn7DWyu0n3pfREHMxQGOwKPf5Sn3gYqy/ksJkHA3FhfVe0jxbDwhVkHuWL/sPsc1sB6EZFmVdKqFeC0uOHNeS0GODv6y7bQNsF8Z6Hs0yDQYjMEsmQ5geUYi44uh9TopiHGFJHVagiNYpffsBdCi9tYB5wEWJNdllMlx4ttRzu58O82MFkkTAXFSmZyireKMdD/sjeN6+xem+C1M0ZIiZYMPyjElKP5S5KsjP3UJLaCPZjMCEYIVAbYeSt4l/q3LaZDIII99np+r1plyEqgkdz3pF+uZZUpmTmwx0fbDUagIilg3mkf8BRM8X+kiSwZ+YB/z6LD+l4aoYUfbhOBdCPwWuchOHkqCe6z9/nKqJm7ibXShovPKGdY334IETb62NvewjsVwC7Y1ADXxmKjBeItnTUsskDpNqfhVVC/1el7sDQwo/J8vOpKxhFRhz4vQlhMb0Q4qiRbKcv7u+mGsnhP3hCH9OzH9AaxHMl59NnLq4Ei29PDqB6WhBLteXrAxhYcwW3WgP+0BixW5kNJKDLIDubIy0JEFoXTAL6Uo4aADEtfeaaDGSJ11ha68r0BvLvVMFAgPjas8Bji7PCZsrrdDVmgUMQnAMj2mHCN8fRL0aCw27Ln34eqK0tsg0SziNaT4JMAlUQ93aCRXOQkwQmMJf6wRkFzqfHNAVKGpwQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(82310400026)(23010399003)(1800799024)(36860700016)(10067099003)(56012099006)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qbq8ztRx1hzkJ0RfpvrvgL08sMJUnf2mXYW1vZL2JHHBVTZdutGAKiAfVyd3kT47MPLL2SX/W2X9E7tOna7wE2x7PbVgJaTvkUBJz5ak50Bo6Wprybm2srYXIccg3XRiSXGdRMeMFWj7mPFw0bXYrG5+2WxIQOwf6p3xJa22yk/nXk88hHbbrtBHJ9GobJvw4IgkJLrPCo+4nO59vczSt7ySXY5j91vZAeWxlBCFyu315cWBfw1H2e1frJF2GFF1Cc6McuOeif1EIwqbmfMHZe0gQJzXSbriJp1KXEWCkpMJ+MarIsc4z6wlu7SrlLMTX82zgJmZUu8iw1+loi1taDlTpWiIhLWqgb0zqRgJg2OpJ6gdu7ayxG8U7w/JBi8GE49iTzYHoSrl5EqKRnsfUyvDjOn5GydCK56jwzQM7/dZYR+vzXdTijZJmxbnlA9S X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2026 20:53:55.5837 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 122c55d0-28fb-4ec3-f7c9-08df14349f7b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000AD7C.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB176418 Content-Type: text/plain; charset="utf-8" From: "Mario Limonciello (AMD)" In order to unify suspend and hibernate codepaths without code duplication the common code should be in common helpers. Move it from pci_pm_suspend_noirq() into a helper. No intended functional changes. Reviewed-by: Rafael J. Wysocki (Intel) Tested-by: Eric Naim Signed-off-by: Mario Limonciello (AMD) --- v5: * Add tag v4: * Make pci_pm_suspend_noirq_common() bool instead (Rafael) --- drivers/pci/pci-driver.c | 77 +++++++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 28 deletions(-) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index e16aa59dd7ac8..8334214f8c1ed 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -818,6 +818,52 @@ static void pci_pm_complete(struct device *dev) =20 #endif /* !CONFIG_PM_SLEEP */ =20 +#if defined(CONFIG_SUSPEND) +/** + * pci_pm_suspend_noirq_common - prepare a device to enter a low-power sta= te + * @pci_dev: pci device + * + * Save the device state and decide whether bus-level power management sho= uld + * skipped. Returns true if bus-level power management should be skipped, + * false otherwise. + */ +static bool pci_pm_suspend_noirq_common(struct pci_dev *pci_dev) +{ + if (!pci_dev->state_saved) { + pci_save_state(pci_dev); + + /* + * If the device is a bridge with a child in D0 below it, + * it needs to stay in D0, so check skip_bus_pm to avoid + * putting it into a low-power state in that case. + */ + if (!pci_dev->skip_bus_pm && pci_power_manageable(pci_dev)) + pci_prepare_to_sleep(pci_dev); + } + + pci_dbg(pci_dev, "PCI PM: Sleep power state: %s\n", + pci_power_name(pci_dev->current_state)); + + if (pci_dev->current_state =3D=3D PCI_D0) { + pci_dev->skip_bus_pm =3D true; + /* + * Per PCI PM r1.2, table 6-1, a bridge must be in D0 if any + * downstream device is in D0, so avoid changing the power state + * of the parent bridge by setting the skip_bus_pm flag for it. + */ + if (pci_dev->bus->self) + pci_dev->bus->self->skip_bus_pm =3D true; + } + + if (pci_dev->skip_bus_pm && pm_suspend_no_platform()) { + pci_dbg(pci_dev, "PCI PM: Skipped\n"); + return true; + } + + return false; +} +#endif /* CONFIG_SUSPEND */ + #ifdef CONFIG_SUSPEND static void pcie_pme_root_status_cleanup(struct pci_dev *pci_dev) { @@ -907,6 +953,7 @@ static int pci_pm_suspend_noirq(struct device *dev) { struct pci_dev *pci_dev =3D to_pci_dev(dev); const struct dev_pm_ops *pm =3D dev->driver ? dev->driver->pm : NULL; + bool skip_bus_pm; =20 if (dev_pm_skip_suspend(dev)) return 0; @@ -937,36 +984,10 @@ static int pci_pm_suspend_noirq(struct device *dev) } } =20 - if (!pci_dev->state_saved) { - pci_save_state(pci_dev); - - /* - * If the device is a bridge with a child in D0 below it, - * it needs to stay in D0, so check skip_bus_pm to avoid - * putting it into a low-power state in that case. - */ - if (!pci_dev->skip_bus_pm && pci_power_manageable(pci_dev)) - pci_prepare_to_sleep(pci_dev); - } + skip_bus_pm =3D pci_pm_suspend_noirq_common(pci_dev); =20 - pci_dbg(pci_dev, "PCI PM: Suspend power state: %s\n", - pci_power_name(pci_dev->current_state)); - - if (pci_dev->current_state =3D=3D PCI_D0) { - pci_dev->skip_bus_pm =3D true; - /* - * Per PCI PM r1.2, table 6-1, a bridge must be in D0 if any - * downstream device is in D0, so avoid changing the power state - * of the parent bridge by setting the skip_bus_pm flag for it. - */ - if (pci_dev->bus->self) - pci_dev->bus->self->skip_bus_pm =3D true; - } - - if (pci_dev->skip_bus_pm && pm_suspend_no_platform()) { - pci_dbg(pci_dev, "PCI PM: Skipped\n"); + if (skip_bus_pm) goto Fixup; - } =20 set_unknown: pci_pm_set_unknown_state(pci_dev); --=20 2.43.0 From nobody Fri Sep 25 04:08:50 2026 Received: from BYAPR05CU005.outbound.protection.outlook.com (mail-westusazon11010051.outbound.protection.outlook.com [52.101.85.51]) (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 8798343DA2E; Wed, 16 Sep 2026 20:54:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.85.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789592084; cv=fail; b=cAOiOJfgHr4fW3nYuks9717drRpswfSqknuuTccku4NCRYnVGFYFC9nDEhmJGSrOEzuDbov8Qi+HxRAAfkqfUthmeUbw7FKCS8pY6/gFVzopGGmzI5JgcBIw55k2y6L9j/QFrjYnfks1arG2VpAov4FwbzBfkjBJiDBNIc5gRBU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789592084; c=relaxed/simple; bh=a/nYmtGQZD5BjAOphsL1kAfLW9zOvFpBYlI557Qxydg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=twZ3CisF8kYmCFnfHYPHuyGFbUYazBxHTAkZvXCvtJTfyXVsU16PdyGzewKJ4V90UzbRyHzX5bS59tCCG1WAttyZb/4q/Zl8EhcDkHtak3FOcH7zxKmDuWdEsEL9Y4iqzkMIHDy4htNfAJ9dS2E+QF6lJpa7ZOmOE3g8HVBZgSU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=kbY2m8Me; arc=fail smtp.client-ip=52.101.85.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="kbY2m8Me" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hfY1YiHCj//ZII1+r12m/EjJuwYZNKV2brW9fihqJyEufsKrf99NvjCkGAQkeVMSPtrK7iXEAYNe8qfo+bfvc3GhdZXGJ4IusPo0CwZqU3YbPKl867xbdnVsk8gfgR8rWtdPz4bjofWf1hGzLVWUAA8Au8tcuOLqRpkSe+dbVdxViowo/729TUIYic+mqP6FloFlsNG1CwetQgqAqxbWnkDIQYcMCks1MCNa5PM1lti7F+E0KXnmu9F/4VBuciNhHZ8sAI0rDuDiDJNXA8hCAwB41Z/Ti5TI/Er31FFh9k9CILksR0LyJ8pfsAx1o5YCJtVtPW/K9c3Rmu+wbfJ+Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/A2TsXk/kei5fwJK4HRbbFgsS4ATcOZ/Dhyvx3qbStw=; b=ISiu1o4Q51PNZSGLuCa5hLnaDzdAeCaXMttRKBogb4jQfNN6aVuA5GOhtYAktv3RSswga64YpPkE86cUrpDJAkLIxlTDdbtJbdMX5YYn18PNdgf11ecXGwX8I6jOsN7pyzWTlU8tcp6bk8zlSZjSeM4i9TMuC8WXPCu/OpLKJTu54C/o7fdquxjgFAvO8NjZw0sbKjOMd2qP7ag/azKTNZfL+vDopHcbmIai90pIhqXspMObkQRMqT1Ndw0gcTZcv6H72B9B+xMe1jfLOPYSghEv5ksLMTvkzIsyeQXlOg4OmyLAPylIHUwCE0qQc3mTbhvZk+/Krx0uFE8J+C1WTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=google.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/A2TsXk/kei5fwJK4HRbbFgsS4ATcOZ/Dhyvx3qbStw=; b=kbY2m8MeDH1QLaFg7YgVJ+GcQwjhi4X4ePwaVgZd3A1cuuwgcg6X1+qhZ4hChOWkuhi9H1dhU8MMvhHRrVCv4B4Y0+emDKllOVuBrwevvKJfVI+wnxWJSJteAsoG84F+Kq4nwbxF9YKzUMMXu9msOhvljCITTixxSguaBZxcKqA= Received: from CH5PR05CA0001.namprd05.prod.outlook.com (2603:10b6:610:1f0::19) by CH2PR12MB9458.namprd12.prod.outlook.com (2603:10b6:610:280::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.12; Wed, 16 Sep 2026 20:53:56 +0000 Received: from CH1PEPF0000AD81.namprd04.prod.outlook.com (2603:10b6:610:1f0:cafe::7f) by CH5PR05CA0001.outlook.office365.com (2603:10b6:610:1f0::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.7 via Frontend Transport; Wed, 16 Sep 2026 20:53:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CH1PEPF0000AD81.mail.protection.outlook.com (10.167.244.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.428.7 via Frontend Transport; Wed, 16 Sep 2026 20:53:56 +0000 Received: from aus0006770c4n-lx01.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.49; Wed, 16 Sep 2026 15:53:55 -0500 From: Mario Limonciello To: Bjorn Helgaas CC: "open list:PCI SUBSYSTEM" , open list , "Rafael J . Wysocki" , Lukas Wunner , , "Mario Limonciello (AMD)" , AceLan Kao , Kai-Heng Feng , Mark Pearson , Denis Benato , =?UTF-8?q?Merthan=20Karaka=C5=9F?= , Eric Naim Subject: [PATCH v5 2/2] PCI: Align hibernate poweroff flow with suspend flow for bridges Date: Wed, 16 Sep 2026 15:53:40 -0500 Message-ID: <20260916205340.2466679-3-mario.limonciello@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260916205340.2466679-1-mario.limonciello@amd.com> References: <20260916205340.2466679-1-mario.limonciello@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000AD81:EE_|CH2PR12MB9458:EE_ X-MS-Office365-Filtering-Correlation-Id: ca01fa7c-83f8-4d8a-7ab5-08df14349fef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|7416014|23010399003|1800799024|376014|36860700016|6133799003|18002099003|22082099003|3023799007|5023799004|10067099003|56012099006|11063799006; X-Microsoft-Antispam-Message-Info: gb8GwihHrpYtU2NaRpKse3dLhRlP69SBK4KSwuv9bLccMDeDwGTCeZRyO+kFssJpXsW6WAxkBZqKGbRsFnZWJYFimyrSCxtpRCUdwERE8rVw3wlAB2a3/epFvEiIkyPPbH2tZ1zDHMtuWxZhBqAnJ40t2nifK2mqGmPxyQztRB/t7HqOczebMwaqWWPgrBM8TGjYr09/LAiXT8WWDGWbVq2qA4shFM2cq7O6Nq7Uw1jl1ntkptzuOznIdM9QcArT76yM6ZcdOB7X22DwdIKyU1+IqtVe/yaF3t3GNDbF+lEfJgN2PEW4XkfiOAMznxnKtTR0cFcVLvvKJ3rBcwXPJ0dgtVkzC/rC3W+Yf7PVSEEuJzaVpel9h2PRpJhzKWfvPpkpTGbTgyG13PjKvkv08b50f4ajNEAD2mSgiQ15MoFig9URH78ma+19e9/OI2cTk6Q2+Ip8awSVscVsgGLJobAjV892ZW/cIj1ex1XSgFQQKpsoxg/pkWBR5YssiOLZfysEAkNE+KDDD/kqeyZeaL401PWLtC0rpz5GgFVSX0TTx1OunVBp0EYR96/6uDodqvWSZUcnajcpcKmind4LAlDZM8Iuxj4dsof6KPsKXJRbT+MtyQ93AtG0ATqR+hzxnCCkfc0d2/zX/YEtpzXu+VJVadvXAkNyuFo9147U2R9QBKCfJ77BKddZY5ezN9HCs9FnyOwmDMEAw7u8yYQTWQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(7416014)(23010399003)(1800799024)(376014)(36860700016)(6133799003)(18002099003)(22082099003)(3023799007)(5023799004)(10067099003)(56012099006)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qRtCk5bs4X6AgXvoqTcJ2ut8psXZZA9y1w0QEygStD8+TrnTKLDxE7YEIffFA8HhJsu1frgGtukQAQyZ9jZFBGtA994mtYY9gdP7YLJZy0WNSNeydmtiljGnt8XFa4g4ZFNPdnHOvNcF7V9gvje29N2uSyDY5n3hkr2IfkI/8BTgnKgfF35Ld/bgzIaSMldS403PKkBzaAy66LBrMPOaI+Acee18cabeprBujqLqMnmBJS6Iv1M9uIimcgFgMzonF3/m6ZnxeAgmxnI6DG3DUvBZ4XAR+DwMfxpsjhyIrUfz3iigG/hk/cbG3oJsi0Vb5+399/g9zBFIprXpBCYBCbjaoSX7AwfATjbioF1G6FDV4nEyazRKCMtxMlwsdPsGlZoapkPzQ1Jj3G4XPKwq3PadhPMyY89SYHrA1i2v4pJtHKIFxoJNwZZxqKw46MCW X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2026 20:53:56.3455 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ca01fa7c-83f8-4d8a-7ab5-08df14349fef X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000AD81.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB9458 From: "Mario Limonciello (AMD)" During S3 suspend, pci_pm_suspend_noirq() puts PCIe bridges with downstream devices into a low-power state (D3hot or D3cold) when the platform allows it. The hibernate poweroff_noirq path never did this: it only called pci_prepare_to_sleep() for devices with no subordinate, so bridges with active children were left in D0. On many designs the platform firmware leaves bridges alone when the system enters S4. This prevents being able to meet various energy certification criteria for different parts of the world, particularly in designs with a dGPU. Align the hibernate flow with suspend by making pci_pm_poweroff_noirq() use pci_pm_suspend_noirq_common() instead of the open-coded pci_prepare_to_sleep() call. This reuses exactly the logic the S3 suspend path uses, including the skip_bus_pm handling that keeps a bridge in D0 when a downstream device must stay in D0 (e.g. a configured wakeup source) and the pm_suspend_no_platform() bus-PM skip. No restore-side change is needed: the hibernation image is snapshotted during the freeze phase, before poweroff_noirq runs, so the powered-down bridge state is never part of the image, and resuming from it goes through a full boot that re-enumerates and retrains the PCIe links. Mirror the suspend_noirq guard for drivers as well: if a driver's poweroff_noirq callback already left the device in a low-power state without saving its configuration, skip pci_pm_suspend_noirq_common() and go straight to the fixups, exactly as pci_pm_suspend_noirq() does. This avoids having the core call pci_save_state() on a device the driver has already powered down, whose configuration space may no longer be readable, which could otherwise corrupt the saved state used on a poweroff abort. Because the poweroff_noirq path now mirrors the already-shipping suspend_noirq path and is guarded identically, bridges that must remain in D0 are unaffected; only bridges that S3 suspend would have powered down are now also powered down at hibernate. Acked-by: Rafael J. Wysocki (Intel) Cc: AceLan Kao Cc: Kai-Heng Feng Cc: Mark Pearson Cc: Denis Benato Cc: Merthan Karaka=C5=9F Tested-by: Eric Naim Signed-off-by: Mario Limonciello (AMD) --- v5: * Add a guard like suspend path has * Add tag for Rafael * Reword title * Clarify that not all designs leave bridges alone at S4 --- drivers/pci/pci-driver.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 8334214f8c1ed..8d293ca66a0d9 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -818,7 +818,7 @@ static void pci_pm_complete(struct device *dev) =20 #endif /* !CONFIG_PM_SLEEP */ =20 -#if defined(CONFIG_SUSPEND) +#if defined(CONFIG_SUSPEND) || defined(CONFIG_HIBERNATE_CALLBACKS) /** * pci_pm_suspend_noirq_common - prepare a device to enter a low-power sta= te * @pci_dev: pci device @@ -862,7 +862,7 @@ static bool pci_pm_suspend_noirq_common(struct pci_dev = *pci_dev) =20 return false; } -#endif /* CONFIG_SUSPEND */ +#endif /* CONFIG_SUSPEND || CONFIG_HIBERNATE_CALLBACKS */ =20 #ifdef CONFIG_SUSPEND static void pcie_pme_root_status_cleanup(struct pci_dev *pci_dev) @@ -1217,6 +1217,8 @@ static int pci_pm_poweroff(struct device *dev) struct pci_dev *pci_dev =3D to_pci_dev(dev); const struct dev_pm_ops *pm =3D dev->driver ? dev->driver->pm : NULL; =20 + pci_dev->skip_bus_pm =3D false; + if (pci_has_legacy_pm_support(pci_dev)) return pci_legacy_suspend(dev, PMSG_HIBERNATE); =20 @@ -1259,6 +1261,7 @@ static int pci_pm_poweroff_noirq(struct device *dev) { struct pci_dev *pci_dev =3D to_pci_dev(dev); const struct dev_pm_ops *pm =3D dev->driver ? dev->driver->pm : NULL; + bool skip_bus_pm; =20 if (dev_pm_skip_suspend(dev)) return 0; @@ -1272,16 +1275,26 @@ static int pci_pm_poweroff_noirq(struct device *dev) } =20 if (pm->poweroff_noirq) { + pci_power_t prev =3D pci_dev->current_state; int error; =20 error =3D pm->poweroff_noirq(dev); suspend_report_result(dev, pm->poweroff_noirq, error); if (error) return error; + + if (!pci_dev->state_saved && pci_dev->current_state !=3D PCI_D0 + && pci_dev->current_state !=3D PCI_UNKNOWN) { + pci_WARN_ONCE(pci_dev, pci_dev->current_state !=3D prev, + "PCI PM: State of device not saved by %pS\n", + pm->poweroff_noirq); + goto Fixup; + } } =20 - if (!pci_dev->state_saved && !pci_has_subordinate(pci_dev)) - pci_prepare_to_sleep(pci_dev); + skip_bus_pm =3D pci_pm_suspend_noirq_common(pci_dev); + if (skip_bus_pm) + goto Fixup; =20 /* * The reason for doing this here is the same as for the analogous code @@ -1290,6 +1303,7 @@ static int pci_pm_poweroff_noirq(struct device *dev) if (pci_dev->class =3D=3D PCI_CLASS_SERIAL_USB_EHCI) pci_write_config_word(pci_dev, PCI_COMMAND, 0); =20 +Fixup: pci_fixup_device(pci_fixup_suspend_late, pci_dev); =20 return 0; --=20 2.43.0