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 C22FA359FAC; Fri, 9 Jan 2026 12:40:53 +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=1767962453; cv=none; b=kCTJ2GDRP9+YPdS5pFwJqthF4lTyLYX3tOrCecLm6O6s84VR6L+wH7W/o2D2hXK+OLAVRbZfSKDiAybaWOIExIn8rB2w7cWA/yi1sMT3yO0MTcw2psQNq0Txmmp3LINxhdhv8dtuYJuEewb4vanLAxaM4XgcIXPSmaI9IbMpXSk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767962453; c=relaxed/simple; bh=ARJ/7r68QbXVj28dkbvRec5om9Z9Awbro6WKSxij7jo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ozmz1XejO6+/smfn8cm9opxTvxDK1QeoG4V4tTSHCHhgOPiRk8HIMsWGHTeMJyqT5HcjMq/Sv9wZ/fqFOhUjJoft7rujVWY8o6eXHvHznpPhIh4vXw2R+LdW51SKVGgdc3POb/tndmRYJt9saKLVxSOa/f3L0MLd3O53YvmzusI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=W15aamyV; 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="W15aamyV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D17DC4CEF1; Fri, 9 Jan 2026 12:40:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1767962453; bh=ARJ/7r68QbXVj28dkbvRec5om9Z9Awbro6WKSxij7jo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W15aamyVi9RtqPb+SMTpN9qvGUb3aHX44/XJpyjBBVRgvkE1QeeWZakaNLuSmEm0W EHW/Lg+kTYBpt/+j+1v4gQ9MIH4J0tm2vWDZJSvgG9rHohZyPgj0YRR87G1tfV5ZHe YEr9uRfLDbKULh889I2HgeamrXEJfmN2lV9fEvgA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ed Tsai , "Rafael J. Wysocki" , Ulf Hansson Subject: [PATCH 6.1 370/634] PM: runtime: Do not clear needs_force_resume with enabled runtime PM Date: Fri, 9 Jan 2026 12:40:48 +0100 Message-ID: <20260109112131.452053024@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260109112117.407257400@linuxfoundation.org> References: <20260109112117.407257400@linuxfoundation.org> User-Agent: quilt/0.69 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 commit 359afc8eb02a518fbdd0cbd462c8c2827c6cbec2 upstream. Commit 89d9cec3b1e9 ("PM: runtime: Clear power.needs_force_resume in pm_runtime_reinit()") added provisional clearing of power.needs_force_resume to pm_runtime_reinit(), but it is done unconditionally which is a mistake because pm_runtime_reinit() may race with driver probing and removal [1]. To address this, notice that power.needs_force_resume should never be set when runtime PM is enabled and so it only needs to be cleared when runtime PM is disabled, and update pm_runtime_init() to only clear that flag when runtime PM is disabled. Fixes: 89d9cec3b1e9 ("PM: runtime: Clear power.needs_force_resume in pm_runtime_reinit()") Reported-by: Ed Tsai Closes: https://lore.kernel.org/linux-pm/20251215122154.3180001-1-ed.tsai@mediatek.com/ [1] Signed-off-by: Rafael J. Wysocki Cc: 6.17+ # 6.17+ Reviewed-by: Ulf Hansson Link: https://patch.msgid.link/12807571.O9o76ZdvQC@rafael.j.wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/base/power/runtime.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -1786,16 +1786,18 @@ void pm_runtime_init(struct device *dev) */ void pm_runtime_reinit(struct device *dev) { - if (!pm_runtime_enabled(dev)) { - if (dev->power.runtime_status == RPM_ACTIVE) - pm_runtime_set_suspended(dev); - if (dev->power.irq_safe) { - spin_lock_irq(&dev->power.lock); - dev->power.irq_safe = 0; - spin_unlock_irq(&dev->power.lock); - if (dev->parent) - pm_runtime_put(dev->parent); - } + if (pm_runtime_enabled(dev)) + return; + + if (dev->power.runtime_status == RPM_ACTIVE) + pm_runtime_set_suspended(dev); + + if (dev->power.irq_safe) { + spin_lock_irq(&dev->power.lock); + dev->power.irq_safe = 0; + spin_unlock_irq(&dev->power.lock); + if (dev->parent) + pm_runtime_put(dev->parent); } /* * Clear power.needs_force_resume in case it has been set by