From nobody Sat Sep 26 13:50:16 2026 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010000.outbound.protection.outlook.com [52.101.46.0]) (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 4323439A07C; Mon, 31 Aug 2026 20:56:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.0 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788209764; cv=fail; b=jB5ckMxfN/oskGwD9Cu/veU97+8SCqWctOdQ9GAz710BCyW/wA7TlVESEGnSqKRwI4eFhpKhM3tWufd7vSS++2LMcAlC3allQv4EDLdRRjAZAh5mwdyjbb0bCsRd07RRICv4QiNKygGbZhcZ0NhVq6we1gLonDTYgNzEaM13mL0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788209764; c=relaxed/simple; bh=BEV7lqhsStuNaPnnrkS5VRHgEJtcyDpte9pNB++m4NU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=p/1D4T30sX3w1kV2Xv1BBdolZhzMJpFqgi1xIvYAREvH2ehskf+/odt6XTbtB440996+cN064zJMXzVQoFUsoC+e/QDNMYTMYpm37truMm9nO5nTliMqPEmDLNwhgXGAxoaV4bFy1obbbbOZIbR7ey9QqscupYGr1mNe7RsNYdc= 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=s8t47qQj; arc=fail smtp.client-ip=52.101.46.0 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="s8t47qQj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=duk8p3R7izgCG+IUB+mkHRloKYUCSGgFqflkUUr+gSlBJNUSWbQ0U7HUZR4xux/OB6hg8iBpn31t+sXMECxWx5DD15wdH6aZy/nAvuaC1pq9liRXjb4z/z99Xgn9KDBgoYb9uHRHje35gABXO+ULN4Smp5YZJORz3Viii5nGZQzYIzqXoR1Qau59Y+05C13lT71hNipmhIRQ3TUAU+wQb/voa6/7B0rS5Ot4dEKwbsn6hOk0rbb4QqVUabP6NV62vHxu8k5PPh1LfiOOvE/VmJL9SxtGxM/b6JC+6jVlG32rge2gzc+I7VJDISocck00tfZ7MCz7DlIqZDMAXYK0rw== 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=cD4x08UtncercJhMeL0Wzb+4undSQG4x3yFC/YaghtQ=; b=xQfF3ysVZi5XzAmUQVgvkJjFmDKUC+iQde7ek1EyOQ84a2jEtniOzN98eSAgt4/XUFJbws9hgqTQcC6zWcdIMNAkom+ycM6vFPyuDS91PHy8VLHv1HNRAojDWJkELqgIuSGQUUbQSFcooUfF/45jbPVsi0/dM4l2Xz6ze3HKQX920qoc/mNnV6UZ5xl+hN5fAs+6DjGG1rCv4v9ugoVQIejFA88l0KsJvwuqzUoYirEPpnkiHlEQnxjeuDaTMpLOLMDLWVCi8UT1MtYMP3YjA6kCGtc3/07U1IheRyHiGIUY1RclFBYkV2X77sO6aeznfo+6LjzXPowqLIaS7k78gA== 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=cD4x08UtncercJhMeL0Wzb+4undSQG4x3yFC/YaghtQ=; b=s8t47qQjTdyJcZqqV8ZofpDbTOw4dcEgWIqO5RNBHsqNvJj+W8RCmQdc5aJrwXaJ8QQl7vtUOghA6ubTYdFnR+/3jmcDg6Vy76/5KaGzgMUTj/MamsLLrgSewc+xvsaOHyrx5fIUEXwPk9g42TsY4kkwWc8uPldfSvUP1d2JPGI= Received: from MN0P221CA0001.NAMP221.PROD.OUTLOOK.COM (2603:10b6:208:52a::7) by PH0PR12MB7959.namprd12.prod.outlook.com (2603:10b6:510:282::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.13; Mon, 31 Aug 2026 20:55:54 +0000 Received: from BN7PEPF000000A0.namprd04.prod.outlook.com (2603:10b6:208:52a:cafe::76) by MN0P221CA0001.outlook.office365.com (2603:10b6:208:52a::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.360.13 via Frontend Transport; Mon, 31 Aug 2026 20:55:54 +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 BN7PEPF000000A0.mail.protection.outlook.com (10.167.248.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.382.8 via Frontend Transport; Mon, 31 Aug 2026 20:55:54 +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.46; Mon, 31 Aug 2026 15:55:52 -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 v3 1/3] PCI/PM: Split out code from pci_pm_suspend_noirq() into helper Date: Mon, 31 Aug 2026 15:55:31 -0500 Message-ID: <20260831205533.2325747-2-mario.limonciello@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260831205533.2325747-1-mario.limonciello@amd.com> References: <20260831205533.2325747-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: BN7PEPF000000A0:EE_|PH0PR12MB7959:EE_ X-MS-Office365-Filtering-Correlation-Id: 7c718ffb-e0da-46df-5d6c-08df07a23f87 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700016|23010399003|82310400026|56012099006|10067099003|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: 5Y3xQpmaGMHena4T8nAAJHbe305GJzTYOhvB71oAye0Q6aQGCd78OW1GXj6oSVuFDaVJzMyXZNnt596vaWRPOYzZxEjRVdINitBOkcCeQtXaXJeSaUgoVkL7Nic4B+o0g62Eywhw0kC+i8QwFZMWwD9OYwVucnJYg2aJOGTVQtB+cz+1/8W9YbR2TYgIH/qxf7Bfu80eofuDQDR3WPXhYflS9JPxhdfOmjsuXS4CDDe+l8p1UM3hQIb1kYxSdDq81Og4kKRCavSSCk8HT5MoRLSP9A51+mdS3NK+Dxp1KfsuQMPagM8Gb5I1JV68/zKe+ibob+KrSHaijzOtAVFWjNJ2DHk1GXnnmJdKmUrKtPLVfnYuDFdylsstZAr1uDYCDAijXBL+0AbQ5ldlH07fBZyoNmfVweIN2z/Nmmi6NiIfZWfcV5MTQqBbfQzvWPSoSaMgdyzLE3PjRX17jIQD8zSMVdI91KThD9fgDRPU8WgUew+4t/aaavPABx+7l31RL3GTOG33CDS0C/6El8nlsfSIWql3eVjVR93ocgWkmYxqFM5XdYM/9/0ZHGY/l/LuAJhQIlU1YbPbw+/aFqhLlf/nUMJPeskYaSGR6WQ9zPKm14427njEw02mHIAUgAqXReVZ/otkoYXtahv2231h8AYcDI+q5U3034zumj41zT9vYx+JxRnZHuCVz+8SC08r49sjszBBCl0Ylauizcvutg== 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)(1800799024)(376014)(36860700016)(23010399003)(82310400026)(56012099006)(10067099003)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1xMMMIo2Azm05xxj122OKtWuRpYdg8puOJZERJdz1c0mITkUVtlU4Uxx19cFIsKyTy7RXcIv2W7xL04i8g1B59ef/OSNqpMUFX/t7Szg8FPOqBprxxUynFqYvORucMVBu2F3xCmPTaWE1YsknffzpVqib8s9CpwD9vvrH6FjwhWd6dnWw7jMeeU3Ia4UumUtrV0wROQYOll6vXQ8FhtnAcUeMxlZ44imEHzdM1PPJ1KLeTMRC8v7p0vPkNIXaePJk9gmwBdg4xDjCvmp+nbYNoDVSqEd5QEfGgBU6XxM2/xm+FqakZVz3VmJ+FCRqXSlhLNpShV8nIUwj+XJO/uOk61Y5cJluS2BNBYvYE3d/ea5WWf3vVJnMTCKVFIkFBkFzP0FP7HCbt+mOO+uVO+k1hOb/nmS/hXU/qoD+/V5nbj7lGE8NOI1dmHHIlymQvjf X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2026 20:55:54.1396 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7c718ffb-e0da-46df-5d6c-08df07a23f87 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: BN7PEPF000000A0.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7959 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. Tested-by: Eric Naim Signed-off-by: Mario Limonciello (AMD) --- drivers/pci/pci-driver.c | 75 +++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index e16aa59dd7ac8..e3d352c7b31d4 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -818,6 +818,50 @@ 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 + * @skip_bus_pm: pointer to a boolean indicating whether to skip bus PM + * + * Save the device state and decide whether bus-level power management sho= uld + * be skipped, reporting the decision back to the caller via @skip_bus_pm. + */ +static void pci_pm_suspend_noirq_common(struct pci_dev *pci_dev, bool *ski= p_bus_pm) +{ + 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"); + *skip_bus_pm =3D true; + } +} +#endif /* CONFIG_SUSPEND */ + #ifdef CONFIG_SUSPEND static void pcie_pme_root_status_cleanup(struct pci_dev *pci_dev) { @@ -907,6 +951,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 =3D false; =20 if (dev_pm_skip_suspend(dev)) return 0; @@ -937,36 +982,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); - } - - pci_dbg(pci_dev, "PCI PM: Suspend power state: %s\n", - pci_power_name(pci_dev->current_state)); + pci_pm_suspend_noirq_common(pci_dev, &skip_bus_pm); =20 - 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 Sat Sep 26 13:50:16 2026 Received: from MW6PR02CU001.outbound.protection.outlook.com (mail-westus2azon11012011.outbound.protection.outlook.com [52.101.48.11]) (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 C88AC5474F; Mon, 31 Aug 2026 20:56:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.48.11 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788209766; cv=fail; b=DPt1ZD11rP2tF8OGt6ifHJA+qubOEusGTKO7o9XwvB9blQT9GiaJaGgFCBViL8TelzocNf8ACujljzRhIyL1SgypA26U5NjftNpnImdY3FL358cIXd1LqXII7w3VPQkvA/BZtY+dUdqBrR3RLhJll9Qt2fnCMrsmptnnEW9fLN8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788209766; c=relaxed/simple; bh=bp5ZQo3T3/jP8S2DfofHDOdYf/ojRiNj8ZPihNL9QsA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NYY3HxbEJgYOLwkK1fIEWrYbcpfTQFY+dpzzic1x3q7SiX1wvtgBfRdBDPyv1F9qlzH3iEb/jppMaMeBjdrs2GN7FNKL5C7JUry0eu+h7BJXvSzoqBGjMeJADBG6rwNR5HW65SxHMnLpf60YQMMMuJq7NWQjlmXQOhTQ5cUu4Dc= 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=dVLtJQTq; arc=fail smtp.client-ip=52.101.48.11 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="dVLtJQTq" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yRDyczRmd9qKxWe4Wo+GZv5C5eb7Mwqa1UZD/vYBaVKF3xaFqILHA15+jRcrTQ0LDYIuzTkS469u57Ilx6vlCSCjSziqk/8W553BzPwUr52PE1+EEOQUuBIWZzR9hq2kpK/ww9LHBeTf4d/3EhAQ1G7MVNXVAEx2pn3WqLx0QGQCTJkJ8LsvyjsHs/kx8MVZluRB6/xNUCZzBJ+UG/JMyjc5xVgSd3fC0axLzw0ZiNmE1VwElMK7+6aW2QYgRe+aSzK722casagpePJvSPadNCwcGs2jEzs+Kp7JWn0ojzIsPIyssSmDqkPG5p6BvxTbQs3wjS9HretiRljYOOqmfw== 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=ojXmQNN9Z+jB8Ydrdwle5P8xI+XvaRSqb6nTe6tbAVY=; b=EBl2Y5+PB5rt7ojeE17XPS/wT/GjREBj9S4wgrWw0OAE9EEjVsXPpkWzd1qtWdtyP1XMNewU6Udif1nPiSaHSe75arwUVzUPuiuojApW2upjRTLYWkMuO3rno8ZuL13qRtVUqPnUxQINtVUCGozgDR8YsmUdMBuoaKi3WYsOwU1uuBx+8T2KRXvhGAhT/MCgrVzVqcre3m6iDycDUMKbYavKmTnlYmI22MRqZW9EPl6tQfqjwQ6ueYKEvowvdVd0CHBawOIvapQQtMfdXnJssosaV36S7pTzgLa+NexKg2VL1638+xf2tqmZLb9ky6Mj+k/Kt2hckuBvz0OAzjYbvw== 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=ojXmQNN9Z+jB8Ydrdwle5P8xI+XvaRSqb6nTe6tbAVY=; b=dVLtJQTqb5l2mY8JcU2B1AhATrm+LONg83KABCsHHXxImmZZLY/A72ylPCgRfw6HMoZzDzlLW7SusDm6ptfur/2eaFqnQZxSg2SuWS3QrArBMg/MHXdef2xtjbWXG64LgLnTblXUAfsjmtHmm4yyK0PAM3cyZYtGwsvyzSPVswU= Received: from MN0P221CA0020.NAMP221.PROD.OUTLOOK.COM (2603:10b6:208:52a::32) by MW4PR12MB6705.namprd12.prod.outlook.com (2603:10b6:303:1e3::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.13; Mon, 31 Aug 2026 20:56:00 +0000 Received: from BN7PEPF000000A0.namprd04.prod.outlook.com (2603:10b6:208:52a:cafe::4d) by MN0P221CA0020.outlook.office365.com (2603:10b6:208:52a::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.360.13 via Frontend Transport; Mon, 31 Aug 2026 20:55:58 +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 BN7PEPF000000A0.mail.protection.outlook.com (10.167.248.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.382.8 via Frontend Transport; Mon, 31 Aug 2026 20:55:58 +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.46; Mon, 31 Aug 2026 15:55:53 -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 v3 2/3] PCI/PM: Run bridge power up actions as part of restore phase Date: Mon, 31 Aug 2026 15:55:32 -0500 Message-ID: <20260831205533.2325747-3-mario.limonciello@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260831205533.2325747-1-mario.limonciello@amd.com> References: <20260831205533.2325747-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: BN7PEPF000000A0:EE_|MW4PR12MB6705:EE_ X-MS-Office365-Filtering-Correlation-Id: 047c07a9-76b4-4fbf-cb2b-08df07a241d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|82310400026|36860700016|376014|1800799024|10067099003|56012099006|11063799006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: IngcUEaWK95/croyfUie759BLzqCdVLznuSGo1JKyMKaCnM4z3JjDHJ0TElLNoFnAe7trgdSMAuLDbX/zv96jHmakbClEePVSYndSqy0Ef4lFmuufywBElGKibtSFOjtKriLO+i2SVubJYqGkHIzJ8bBqF296eJzWByXdbDulNmKGqKEVKOFmd7XLmWSGdUnvyxsXdTMMwPT+zbF6PjFRnQmtNGn0NzA1s7btP+O5NjvyixiUOljwwoU9k28nfJ9YBcb+eOsjQEKtgOGMD7oWWP1n9yQVzIPiKITWbyyFOTw3lHDQpzjAiFI4za72ihNLYUr/ZytZSoMa0tNImLGCx4zshj+x+Tf1Iwkx2r9k0OR4v9RgTJKuHEpZs0V1EUYJe6WJpXdelniU3NoF6j1GLvyIiNpjO5/vx5PjDdEmkOyodOzJI8lZH00yiHsK7UTzeWQRvyY3+r9vQpV+LjS4N3TQRAe4OS8hWrRrIqAYiG/2cO2HsHIT86iIqnARx7PKY3AKAdTKhSsskw4+4cGBdfnaUG/FpgeCLr7vglmsiQSamT4eeRQGEp84sq6SvcTJJZm5M1QURS0P+FvCXGK98U3F7YIsRt4zMuqVBG8LUpi5TEt0J9yzkDflHMr6YoZbwPpH9ZFzWDcye8qoyB9VS+xjbQH10dAmSsm29BeU083Cgs57QFZTkXip7oSjZtY5Fj/XBOP4rlp+z7fExD1WA== 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)(23010399003)(82310400026)(36860700016)(376014)(1800799024)(10067099003)(56012099006)(11063799006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7MUosVpGPHfxvzHH7rQuafYzuAWUGBSMRsCG4r4oOi2NIikQ9P17b3ZCADD1WOweS9eC8xQyV+MAv/jvaPs4GxskmI4PNfx6ZBJOEaFQLtChS/RLsd0NcbD4dVukiPUUgkuYOYpPqZCyM1j8kcGANW24r3a9CCrHil+Yz90MhvpsVt2ljO3WgnWbX7cpwiR+rHJmbqr3PosI/C7dWCSDvZzFL0ZNilRCtkJGrgpB7UtRR4GQ21PGg9+GM+uf2ZYPLbcP6XDf/wR2ATTwt4eG68pnjOhkbfJbW2b2nYdJosLsyyTF4dajNKL93gAkqefWPgbvM6j6Es0eOkI8eCDJ3pnM+ykwYkmaJ/O06bZCqakIttYdbM6nxndkjWmYpUWcDby+YNC/lKMwQKQr2CKtNVvo1uOFstY2DeFCAA3KeqdBPh8ztIDLTofiq7fA9AVo X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2026 20:55:58.0301 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 047c07a9-76b4-4fbf-cb2b-08df07a241d8 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: BN7PEPF000000A0.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6705 Content-Type: text/plain; charset="utf-8" From: "Mario Limonciello (AMD)" pci_pm_resume_noirq() calls pci_pm_bridge_power_up_actions() when a bridge is coming back from D3cold and bus PM was not skipped, so that the mandatory post-power-on link training delays are observed before any downstream device is accessed. The last patch in this series makes the hibernate poweroff_noirq path put bridges with downstream devices into D3 (including D3cold), mirroring what the S3 suspend path already does. For that to be safe, the hibernate image restore path has to bring those bridges back up the same way suspend resume does; otherwise a downstream device may be accessed before its parent bridge's link is retrained. Add the same bridge power up actions to pci_pm_restore_noirq(), gated on the same conditions as the resume path (bus PM not skipped and the previous state being D3cold), so that hibernate restore and suspend resume behave identically for bridges. Tested-by: Eric Naim Signed-off-by: Mario Limonciello (AMD) --- drivers/pci/pci-driver.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index e3d352c7b31d4..d15b3eb55ec53 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1297,10 +1297,15 @@ static int pci_pm_restore_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; + pci_power_t prev_state =3D pci_dev->current_state; + bool skip_bus_pm =3D pci_dev->skip_bus_pm; =20 pci_pm_default_resume_early(pci_dev); pci_fixup_device(pci_fixup_resume_early, pci_dev); =20 + if (!skip_bus_pm && prev_state =3D=3D PCI_D3cold) + pci_pm_bridge_power_up_actions(pci_dev); + if (pci_has_legacy_pm_support(pci_dev)) return 0; =20 --=20 2.43.0 From nobody Sat Sep 26 13:50:16 2026 Received: from DM5PR21CU001.outbound.protection.outlook.com (mail-centralusazon11011008.outbound.protection.outlook.com [52.101.62.8]) (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 10FB339C017; Mon, 31 Aug 2026 20:56:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.62.8 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788209768; cv=fail; b=a3B72+0UxJX4CimUpbHm+NilY1PKNZpD2FILSjTR/7DtCTIM8Yn3nRB9jk4R8p0mG2mPmS8DJDQ+qdx0FPrwLj3pO2MuCJn7lI49l2ydTnb5f1klItybEWqkL7e2tjc2wjfQmnhdvVmreBZfD5ZOxdHdsCQ9mMsvIlVf+KOI+fM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788209768; c=relaxed/simple; bh=R+OYr8Ay5Jobwjie7dsyHiGUtv5lDbXWhfZ67mZUszU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=E+imcm3u5si8StCax+1YPSAC03zgAoIs43xDgdiS+gmhtk/JMcs0ju+5ILqi+5RafIYdCAUaI+4oNq9bj66fAIA7CMlSHPSxcNxn7B3hD6RQ5xOp5XvbpBVNY45e5Nx2U9H4BM61UBTbEx6M+/hfxzzAFRAoyOQ2xmq74DPFCh8= 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=e3bexQdY; arc=fail smtp.client-ip=52.101.62.8 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="e3bexQdY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GgzWJwvltjd95+e5OHOCOFldLAKm56GJUvSFpL8neq7ZU2clPF7Z7/oZXQi9jxDDA+GYPdUzk5lcS0Lx6+aoUQxkeItXiapWqVfNSYOlu6zwK6V/HVi2xAdhEhI8+AbbEOZV9m6SHAe8UKJ6yU3wESXn+Mny3kTBKuUMFc8G1DeR0dA7vGt9SlDqJyu31xVfsot8K0kG3UYx4nIOGHFk6fKptmot8rPTXcT18OihGugJYAeQjW9L5tx/k73PtMMByIWwrgXwy0EEdj0Npvfu29ErSnZ/eyFMDavMWayU6bab77TG81dfJ5cbiZ7OZeHbuDp+jLueEfhA4ue11kY4Kg== 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=8u53UC/oFOVSE/S7vJq9416o3dH6jm9xSuyx7qkZOcY=; b=cCH1cSFE0ObsOCc7lPUcUuJz/QdkgeoI42XFI+hVz4bGFFYpXOEVKYwp2cRR/lt7Edhv2AUSV4L/wComjNHt0Deb8eoxQrDtA02OPRQLMHL3e4MGAFtgd5A/rlmraHg/kO8vk+XqcEfPnlgJaJYZa3m0LNMskWZoomxfBliXlliNM5cfmx5bIKSD9e3DxW7ZIXdQD403C48r/1YmIN3MLTzdEVrPWGgzLvuUSdx18v0nLk1GxjlTXVIj0uo2Yk2XeYgMt8qr9hbrj9rzXM9y8rT7cwGVbCnrWkHL2LUVaxRRxm3q5M0qbA+yJGTVTgaD7ggtaC1YimmLZ3vhUCL60A== 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=8u53UC/oFOVSE/S7vJq9416o3dH6jm9xSuyx7qkZOcY=; b=e3bexQdY2ra7D0WQtDoCQo1jJyG3Ax97TP+Mc/9fbmLT8YEEICDK2joHjU2BdadumpI5h7XPYcfac1RvVEmRoKSXYD3/+1o4JGdqoSOdy+7lmUby+R00TQXieX9Xt4ir/4wgNML3itMvMk89+t/vk03q97cFBA4Q03z47d8zkMU= Received: from MN0P221CA0005.NAMP221.PROD.OUTLOOK.COM (2603:10b6:208:52a::15) by MN2PR12MB4486.namprd12.prod.outlook.com (2603:10b6:208:263::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.8; Mon, 31 Aug 2026 20:56:02 +0000 Received: from BN7PEPF000000A0.namprd04.prod.outlook.com (2603:10b6:208:52a:cafe::1f) by MN0P221CA0005.outlook.office365.com (2603:10b6:208:52a::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.360.13 via Frontend Transport; Mon, 31 Aug 2026 20:56:02 +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 BN7PEPF000000A0.mail.protection.outlook.com (10.167.248.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.382.8 via Frontend Transport; Mon, 31 Aug 2026 20:56:02 +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.46; Mon, 31 Aug 2026 15:55: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 v3 3/3] PCI: Put PCIe bridges with downstream devices into D3 at hibernate Date: Mon, 31 Aug 2026 15:55:33 -0500 Message-ID: <20260831205533.2325747-4-mario.limonciello@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260831205533.2325747-1-mario.limonciello@amd.com> References: <20260831205533.2325747-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: BN7PEPF000000A0:EE_|MN2PR12MB4486:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d86f3e6-b7b1-48f1-5308-08df07a2443c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|36860700016|1800799024|82310400026|23010399003|56012099006|10067099003|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: l/qFINQwDT77pZM7erz2eo2ZvQ3/pD43+3jLI65kBBUQmDLGWYX3kT6FLENjv3F86dk4rvTtPNcZff3Sm3GgJ0thOD7+N3N8+dYXEe4+PawkwvDPbEP//TDso3ZYhxtquQDAzF4I031tGeXR6CQ1NSfkWcsgCgAq9kLgRfbXIIQO3JIMezBKhLUr/CDiOVoDz7hxL+hiDLZMTU0+GtbLsLYsmwnorci7fQZ2te+hNiXTwYKVNQ6GMv7BEH5ifStBPaq4ZM8wQD88MPIoGqO03Ph6/HVVctMLXGSJzFaOwuYs+O9xqtqEMQgJdlt5kY9LadwWDjVCY+S8xrA5JTwOrRq/l6KazAHuUKXNIgvPDOFR6nCXU6V3hbC7BqG/4r1neM3wiMrHGWs6TpFGavRT0sQPu9bx36/pU5z/hT237b+daNxs9k4f1Tl6zZzLTNIJZtJCli5mupOg+Vli3qfoGP0llRFrMgvUcJ3chH7ZJ22r/QFz+hn0odqDjiTS152fP5RCIsldbTiUkqwxmsMvra+fgpHcG84bgloUCOqLOafDil2SVMvkmtDm57skbWBSHlXmed5pUCTiwnjK3TXfQF1Cay7sE4XlGj3VQIqEAVi/NEDfXAlfLMIqo1ObRbHLAN0zXP7im9Ava5HPnF8NkQ+p0Gim2gtu6wkgODmyxS5D+vmUZPnnp9bQIUFUroZyTVU61Twj5FEspZzaaKRSpA== 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)(7416014)(376014)(36860700016)(1800799024)(82310400026)(23010399003)(56012099006)(10067099003)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: szeKpFTzQe9/lJcPfa7uhu2x4iWEunwkVFpwomaNU+ASU0s8X0Wq3RO8tbC1v0TWaVjlLu+fPZD1e/udmzg+o5WtE+oHKYjc36GwKmGBGS6DP7S9PsFeHp8pJQTh/vI2LDqbyCZ06wObQ0ODTHXj/ONz4BLMNlC+M2NS1s3NYK/uhYVwadJ+QR9+yJbSC9IyKcEBXY4wPDrQxlNZ4gmI880ibYt9UNj3DojvsgmXlyiEVrNdhAOe02q5byAa3OfBH8MJwSDIVCYH/6SSScyFwI76nHAfDKQprWQvJeRQcShsAPfwzK4FvS7X0mhzRKObHi/K4JrEB3LIQTc6w4ww0mduMQyXJw6RwEeQ50XgQhopK7qcV8ot1oS9qg5it75rtNMDbA64yA37lWMLi5qFzi+YkH7vq52uLRPyNwakur9o6F7YqPug/fFFAI/GBBcl X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2026 20:56:02.0369 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3d86f3e6-b7b1-48f1-5308-08df07a2443c 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: BN7PEPF000000A0.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4486 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. 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. The restore side is handled by the preceding patch, which runs the bridge power up actions when a bridge comes back from D3cold. 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. 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) --- 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 d15b3eb55ec53..a6fb731378d9c 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 @@ -860,7 +860,7 @@ static void pci_pm_suspend_noirq_common(struct pci_dev = *pci_dev, bool *skip_bus_ *skip_bus_pm =3D true; } } -#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) @@ -1215,6 +1215,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 @@ -1257,6 +1259,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 =3D false; =20 if (dev_pm_skip_suspend(dev)) return 0; @@ -1278,8 +1281,9 @@ static int pci_pm_poweroff_noirq(struct device *dev) return error; } =20 - if (!pci_dev->state_saved && !pci_has_subordinate(pci_dev)) - pci_prepare_to_sleep(pci_dev); + pci_pm_suspend_noirq_common(pci_dev, &skip_bus_pm); + if (skip_bus_pm) + goto Fixup; =20 /* * The reason for doing this here is the same as for the analogous code @@ -1288,6 +1292,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