FAILED: patch "[PATCH] cpufreq: intel_pstate: Use correct scaling factor on Raptor" failed to apply to 6.18-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
git checkout FETCH_HEAD
git cherry-pick -x 0e7c710478b3089cdfe8669347f77b163e836c4f
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026052846-jasmine-recess-d8cc@gregkh' --subject-prefix 'PATCH 6.18.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 0e7c710478b3089cdfe8669347f77b163e836c4f Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <[email protected]>
Date: Tue, 12 May 2026 21:20:30 +0200
Subject: [PATCH] cpufreq: intel_pstate: Use correct scaling factor on Raptor
Lake-E
Raptor Lake-E has the same processor ID as Raptor Lake-S, so there is an entry in intel_hybrid_scaling_factor[] for it. It does not contain E-cores though and hybrid_get_cpu_type() returns 0 for its P-cores, so they get the default "core" scaling factor. However, the original Raptor Lake scaling factor for P-cores still needs to be used for mapping the HWP performance levels of the P-cores in Raptor Lake-E to frequency, as though they were part of a real hybrid system.
To address this, update hwp_get_cpu_scaling() to return hybrid_scaling_factor, which is the P-core scaling factor retrieved from intel_hybrid_scaling_factor[], for all CPUs that are not enumerated as E-cores.
drivers/cpufreq/intel_pstate.c +1 -1
@@ -2279,7 +2279,7 @@ static int hwp_get_cpu_scaling(int cpu)* Return the hybrid scaling factor for P-cores and use the * default core scaling for E-cores. */ -if (hybrid_get_cpu_type (cpu) ==INTEL_CPU_TYPE_CORE ) +if (hybrid_get_cpu_type (cpu) !=INTEL_CPU_TYPE_ATOM )return hybrid_scaling_factor;return core_get_scaling ();
Sasha Levin
maintainerPATCH 1/2 cpufreq: intel_pstate: Add and use hybrid_get_cpu_type()
From: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit 528dde6619677ac6dc26d9dda1e3c9014b4a08c8 ]
Introduce a function for identifying the type of a given CPU in a hybrid system, called hybrid_get_cpu_type(), and use if for hybrid scaling factor determination in hwp_get_cpu_scaling().
Stable-dep-of: 0e7c710478b3 ("cpufreq: intel_pstate: Use correct scaling factor on Raptor Lake-E")
--- drivers/cpufreq/intel_pstate.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/cpufreq/intel_pstate.c +7 -6
@@ -909,6 +909,11 @@ static struct freq_attr *hwp_cpufreq_attrs[] = { [HWP_CPUFREQ_ATTR_COUNT] = NULL, }; +static u8 hybrid_get_cpu_type (unsigned int cpu) +{ +return cpu_data (cpu).topo.intel_type; +} +static bool no_cas__ro_after_init ;static struct cpudata *hybrid_max_perf_cpu__read_mostly ;
@@ -2299,18 +2304,14 @@ static int knl_get_turbo_pstate(int cpu)static int hwp_get_cpu_scaling (int cpu) {if (hybrid_scaling_factor) { -struct cpuinfo_x86 *c = &cpu_data (cpu); -u8 cpu_type = c->topo.intel_type; -/* * Return the hybrid scaling factor for P-cores and use the * default core scaling for E-cores. */ -if (cpu_type ==INTEL_CPU_TYPE_CORE ) +if (hybrid_get_cpu_type (cpu) ==INTEL_CPU_TYPE_CORE )return hybrid_scaling_factor; -if (cpu_type ==INTEL_CPU_TYPE_ATOM ) -return core_get_scaling (); +return core_get_scaling (); }/* Use core scaling on non-hybrid systems. */
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 cpufreq: intel_pstate: Use correct scaling factor on Raptor Lake-E
From: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit 0e7c710478b3089cdfe8669347f77b163e836c4f ]
Raptor Lake-E has the same processor ID as Raptor Lake-S, so there is an entry in intel_hybrid_scaling_factor[] for it. It does not contain E-cores though and hybrid_get_cpu_type() returns 0 for its P-cores, so they get the default "core" scaling factor. However, the original Raptor Lake scaling factor for P-cores still needs to be used for mapping the HWP performance levels of the P-cores in Raptor Lake-E to frequency, as though they were part of a real hybrid system.
To address this, update hwp_get_cpu_scaling() to return hybrid_scaling_factor, which is the P-core scaling factor retrieved from intel_hybrid_scaling_factor[], for all CPUs that are not enumerated as E-cores.
--- drivers/cpufreq/intel_pstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/intel_pstate.c +1 -1
@@ -2308,7 +2308,7 @@ static int hwp_get_cpu_scaling(int cpu)* Return the hybrid scaling factor for P-cores and use the * default core scaling for E-cores. */ -if (hybrid_get_cpu_type (cpu) ==INTEL_CPU_TYPE_CORE ) +if (hybrid_get_cpu_type (cpu) !=INTEL_CPU_TYPE_ATOM )return hybrid_scaling_factor;return core_get_scaling ();
Signature · 1 line
2.53.0