Linux Power Management development
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rafael@kernel.org>
To: Linux PM <linux-pm@vger.kernel.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>,
	Christian Loehle <christian.loehle@arm.com>,
	Doug Smythies <dsmythies@telus.net>,
	Zak <zakbrightonknight@gmail.com>,
	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
	Mario Limonciello <superm1@kernel.org>
Subject: [PATCH v2 2/3] cpufreq: Force passing target frequency to driver during resume
Date: Tue, 03 Nov 2026 20:47:48 +0100	[thread overview]
Message-ID: <1995295.tdWV9SEqCh@rafael.j.wysocki> (raw)
In-Reply-To: <6065833.DvuYhMxLoT@rafael.j.wysocki>

From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>

The policy->cur value preserved across a system suspend-resume cycle
may become stale in some cases and it may prevent the CPU performance
scaling logic from being updated due to the target_freq == policy->cur
check in __cpufreq_driver_target() [1].

To address this, adjust the existing mechanism to force the invocation
of the driver .target() callback in __cpufreq_driver_target() and make
cpufreq_resume_policy() use it.

This involves renaming update_limits in struct cpufreq_policy to
force_target and moving the driver CPUFREQ_NEED_UPDATE_LIMITS flag check
from __cpufreq_driver_target() to cpufreq_set_policy(), where it is used
as a condition for setting policy->force_target.

In cpufreq_resume_policy(), policy->force_target is set for drivers that
implement the .target() callback, but don't implement the .get() one,
which is the case when the driver callback needs to run if policy->cur
becomes stale while suspended.

Fixes: 2f0aea936360 ("cpufreq: suspend governors on system suspend/hibernate")
Link: https://lore.kernel.org/linux-pm/20261027143725.3763827-1-zakbrightonknight@gmail.com/ [1]
Reported-by: Zak Brighton Knight <zakbrightonknight@gmail.com>
Reported-by: Doug Smythies <dsmythies@telus.net>
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

v1 -> v2:
   * Always clear policy->force_target if set in __cpufreq_driver_target()
     to avoid forcing the driver callback next time unnecessarily (Sashiko)

   * Replace an outdated comment in __cpufreq_driver_target()

   * Set policy->force_target only if .target() is present and .get() is not
     present because that is the only case in which it may matter

   * Update changelog

---
 drivers/cpufreq/cpufreq.c |   33 +++++++++++++++++++++------------
 include/linux/cpufreq.h   |    4 ++--
 2 files changed, 23 insertions(+), 14 deletions(-)

--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2023,6 +2023,15 @@ static void cpufreq_resume_policy(struct
 	if (!start)
 		return;
 
+	/*
+	 * Force executing the driver .target() callback, if present, in the
+	 * next invocation of __cpufreq_driver_target() in case policy->cur has
+	 * become stale while suspended, but do it only for drivers without a
+	 * .get() callback for which cpufreq_verify_current_freq() is a NOP.
+	 */
+	if (cpufreq_driver->target && !cpufreq_driver->get)
+		policy->force_target = true;
+
 	if (cpufreq_start_governor(policy))
 		pr_err("%s: Failed to start governor for CPU%u's policy\n",
 		       __func__, policy->cpu);
@@ -2400,17 +2409,14 @@ int __cpufreq_driver_target(struct cpufr
 		policy->cpu, policy->cur, target_freq, old_target_freq, relation);
 
 	/*
-	 * This might look like a redundant call as we are checking it again
-	 * after finding index. But it is left intentionally for cases where
-	 * exactly same freq is called again and so we can save on few function
-	 * calls.
+	 * Unless invoking the target callback is forced, skip the update if the
+	 * frequency is not really changing.
 	 */
-	if (target_freq == policy->cur) {
-		if (!(cpufreq_driver->flags & CPUFREQ_NEED_UPDATE_LIMITS) ||
-		    !policy->update_limits)
-			return 0;
-
-		policy->update_limits = false;
+	if (policy->force_target) {
+		/* Avoid forcing the driver callback unnecessarily next time. */
+		policy->force_target = false;
+	} else if (target_freq == policy->cur) {
+		return 0;
 	}
 
 	if (cpufreq_driver->target) {
@@ -2669,6 +2675,7 @@ static int cpufreq_set_policy(struct cpu
 			      struct cpufreq_governor *new_gov,
 			      unsigned int new_pol)
 {
+	bool need_update_limits = cpufreq_driver->flags & CPUFREQ_NEED_UPDATE_LIMITS;
 	struct cpufreq_policy_data new_data;
 	struct cpufreq_governor *old_gov;
 	unsigned int freq;
@@ -2708,7 +2715,8 @@ static int cpufreq_set_policy(struct cpu
 			      CPUFREQ_RELATION_H);
 	if (freq != policy->max) {
 		WRITE_ONCE(policy->max, freq);
-		policy->update_limits = true;
+		if (need_update_limits)
+			policy->force_target = true;
 	}
 
 	freq = __resolve_freq(policy, new_data.min, new_data.min, new_data.max,
@@ -2716,7 +2724,8 @@ static int cpufreq_set_policy(struct cpu
 	freq = min(freq, policy->max);
 	if (freq != policy->min) {
 		WRITE_ONCE(policy->min, freq);
-		policy->update_limits = true;
+		if (need_update_limits)
+			policy->force_target = true;
 	}
 
 	trace_cpu_frequency_limits(policy);
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -146,8 +146,8 @@ struct cpufreq_policy {
 	/* Per policy boost supported flag. */
 	bool			boost_supported;
 
-	/* Pending policy->min/max update for the driver */
-	bool			update_limits;
+	/* Force passing target frequency to the driver. */
+	bool			force_target;
 
 	/* The policy has been suspended. */
 	bool			suspended;




  parent reply	other threads:[~2026-11-03 19:49 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-03 19:42 [PATCH v2 0/3] cpufreq: Fix synchronization with system suspend/resume Rafael J. Wysocki
2026-11-03 19:45 ` [PATCH v2 1/3] cpufreq: Improve suspend-resume synchronization Rafael J. Wysocki
2026-11-18 13:03   ` [REGRESSION: " Borah, Chaitanya Kumar
2026-11-03 19:47 ` Rafael J. Wysocki [this message]
2026-11-04 11:56   ` [PATCH v2 2/3] cpufreq: Force passing target frequency to driver during resume Christian Loehle
2026-11-04 13:44     ` Rafael J. Wysocki (Intel)
2026-11-04 15:09       ` Christian Loehle
2026-11-04 15:46         ` Rafael J. Wysocki (Intel)
2026-11-03 19:49 ` [PATCH v2 3/3] cpufreq: intel_pstate: Clear last written P-state value on suspend Rafael J. Wysocki
2026-11-03 20:06 ` [PATCH v2 0/3] cpufreq: Fix synchronization with system suspend/resume Mario Limonciello
2026-11-03 23:26 ` Zak Brighton Knight
2026-11-04  2:44 ` Zhongqiu Han
2026-11-04  4:19 ` Viresh Kumar
2026-11-04  4:38 ` Doug Smythies
2026-11-04 12:18 ` Christian Loehle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1995295.tdWV9SEqCh@rafael.j.wysocki \
    --to=rafael@kernel.org \
    --cc=christian.loehle@arm.com \
    --cc=dsmythies@telus.net \
    --cc=linux-pm@vger.kernel.org \
    --cc=srinivas.pandruvada@linux.intel.com \
    --cc=superm1@kernel.org \
    --cc=viresh.kumar@linaro.org \
    --cc=zakbrightonknight@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox