From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 C777531E848 for ; Thu, 28 May 2026 11:48:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779968921; cv=none; b=hTkgN4Ory5tDxQkENzX56aUxf5diPlJfgKRQVl1x/lJwIzQWKqTAQWB0n/wUXWY2tsN138tH7T9yvbHZS52CY9+pJ9v85YgayY6MyIfnBABI+by7vby64IielyIPzqdQjzbvKvJU+bvoHd31rO078/0p6AwKdRz8D8cG/VxuKv4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779968921; c=relaxed/simple; bh=GEm2FGsnFXxNNzF8Wda9m/VyBwnVIFOBQKRfRipJPfs=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=qZYl/D8kjoIVnUF3GJERdL/akhPEsnC55kQKDYmMRaBD4rW3b9QtSNhMVY+tadbWrcS90JeTLnn49PQKti5P8lRiKPy33hN7noagZG19QcK9J7JbKnG/HVrF8H5PSwutJGYeuJn9bL6wP3b25GVoNWK7EtwKnO/9fnJ3zbyQNis= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Nn3NJBQk; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Nn3NJBQk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0FDB41F00A3A; Thu, 28 May 2026 11:48:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779968920; bh=A+gzSyRMGPz6WAKlcxEfHJPu9H4lBU8P/judyPC3Lw0=; h=Subject:To:Cc:From:Date; b=Nn3NJBQkoUwyxkkINwDLcRH5/+m2tI77tHvW41Lb6YKIhXkLdqd0AFm0IWahyyXEN m98ulKGmjhZ/hhI/9V/U9fblDpXwnNtgrhzJ8BuOzs8mPlvVVVTuxv33K/FSCWU5OC +T/f09iLIxc7KpOfrITRTrMx8NdWBQx0FG2ut3Ks= Subject: FAILED: patch "[PATCH] cpufreq: intel_pstate: Use correct scaling factor on Raptor" failed to apply to 6.18-stable tree To: rafael.j.wysocki@intel.com,henrytseng@qnap.com,stable@vger.kernel.org Cc: From: Date: Thu, 28 May 2026 13:47:46 +0200 Message-ID: <2026052846-jasmine-recess-d8cc@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The 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 . 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 # git commit -s git send-email --to '' --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" 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. Fixes: 9b18d536b124 ("cpufreq: intel_pstate: Use CPPC to get scaling factors") Link: https://lore.kernel.org/all/20260511235328.2018458-1-srinivas.pandruvada@linux.intel.com/ Reported-by: Henry Tseng Closes: https://lore.kernel.org/linux-pm/20260508063032.3248602-1-henrytseng@qnap.com/ Signed-off-by: Rafael J. Wysocki Cc: All applicable Link: https://patch.msgid.link/4523296.ejJDZkT8p0@rafael.j.wysocki diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 1292da53e5fc..978e2b604ac8 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -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();