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 0900B1EE7C6; Mon, 23 Jun 2025 21:36:13 +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=1750714573; cv=none; b=kaJwKOq/SBrD4RmAxMCgdULRksy6Bd188tq2/DLep0pawivWuxmppF/o0C5B7i9VVDCPyeACkZMmM/XeJ2H0elUsUgmp+vqcmZFCaNcU1Toj6wUqTu+7xUez1QfoGdlz+9j92a9ZtxCAqTwsqQc9A0qdgK4cDfcNSR9NB0PMjR4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750714573; c=relaxed/simple; bh=ZAfoKxkPgR7Sar8WKslm2DW8+JuR2Xbc8bKncMMLyyc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AMoOWgzAzKtLAdrZHNK/wTWfoBF6M7rU4VD5CkUzjxvVYcENW3vww+8FX/KH2XtNGMYNxqeC6xXlmZxShR9gsMth6FMjJSz4gcHGKIeHBmizppeM8dl4svOTo0mPUZ1uLYCZ9+Q/Yr83bRP0zN+gTvarfAhjnI9Cs1IcbNynbh0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GD3UtM9g; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GD3UtM9g" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95543C4CEEA; Mon, 23 Jun 2025 21:36:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750714572; bh=ZAfoKxkPgR7Sar8WKslm2DW8+JuR2Xbc8bKncMMLyyc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GD3UtM9g7a4aT2oCJXVPF3SAjZDsKp5wRNLwFqQKiJCSKZwgn2FlfdFhRc/QThGd0 gLYOHN/81jAB3MX8Hh9eEQVNWrtpPbM9rBbH8/9l3ieIV/zeRzdBWP8nbjPFCvi1wy j/OUfT2wqE0ODviJsoN8WKubUewamvt3tpRm+oEo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Rafael J. Wysocki" , Mario Limonciello , Sasha Levin , Chris Bainbridge Subject: [PATCH 6.1 182/508] PM: sleep: Fix power.is_suspended cleanup for direct-complete devices Date: Mon, 23 Jun 2025 15:03:47 +0200 Message-ID: <20250623130649.752396359@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130645.255320792@linuxfoundation.org> References: <20250623130645.255320792@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rafael J. Wysocki [ Upstream commit d46c4c839c20a599a0eb8d73708ce401f9c7d06d ] Commit 03f1444016b7 ("PM: sleep: Fix handling devices with direct_complete set on errors") caused power.is_suspended to be set for devices with power.direct_complete set, but it forgot to ensure the clearing of that flag for them in device_resume(), so power.is_suspended is still set for them during the next system suspend-resume cycle. If that cycle is aborted in dpm_suspend(), the subsequent invocation of dpm_resume() will trigger a device_resume() call for every device and because power.is_suspended is set for the devices in question, they will not be skipped by device_resume() as expected which causes scary error messages to be logged (as appropriate). To address this issue, move the clearing of power.is_suspended in device_resume() immediately after the power.is_suspended check so it will be always cleared for all devices processed by that function. Fixes: 03f1444016b7 ("PM: sleep: Fix handling devices with direct_complete set on errors") Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4280 Reported-and-tested-by: Chris Bainbridge Signed-off-by: Rafael J. Wysocki Reviewed-by: Mario Limonciello Link: https://patch.msgid.link/4990586.GXAFRqVoOG@rjwysocki.net Signed-off-by: Sasha Levin --- drivers/base/power/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 343d3c966e7a7..baa31194cf20d 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -897,6 +897,8 @@ static void __device_resume(struct device *dev, pm_message_t state, bool async) if (!dev->power.is_suspended) goto Complete; + dev->power.is_suspended = false; + if (dev->power.direct_complete) { /* Match the pm_runtime_disable() in __device_suspend(). */ pm_runtime_enable(dev); @@ -952,7 +954,6 @@ static void __device_resume(struct device *dev, pm_message_t state, bool async) End: error = dpm_run_callback(callback, dev, state, info); - dev->power.is_suspended = false; device_unlock(dev); dpm_watchdog_clear(&wd); -- 2.39.5