diff mbox series

[1/1,SRU,U/K/J/OEM-6.0/OEM-5.17] UBUNTU: SAUCE: tools/power turbostat: add support for RPL-S

Message ID 20220930074246.1192223-2-koba.ko@canonical.com
State New
Headers show
Series UBUNTU: SAUCE: Fix Turbostat is not working for fam: 6 model: 191: stepping: 2 CPU | expand

Commit Message

Koba Ko Sept. 30, 2022, 7:42 a.m. UTC 
From: Zhang Rui <rui.zhang@intel.com>

BugLink: https://bugs.launchpad.net/bugs/1991365

Add turbostat support for RAPTORLAKE_S platform, which behaves the same
as RAPTORLAKE and RAPTORLAKE_P platforms.

RPL-S 601/801 have different CPU ID than the Hybrid ADL-S platforms.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
(cherry picked from https://patchwork.kernel.org/project/linux-pm/patch/20220831064957.1773-1-rui.zhang@intel.com/)
Signed-off-by: Koba Ko <koba.ko@canonical.com>
---
 tools/power/x86/turbostat/turbostat.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Kleber Souza Oct. 11, 2022, 8:51 a.m. UTC | #1 
On 30.09.22 09:42, Koba Ko wrote:
> From: Zhang Rui <rui.zhang@intel.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1991365
> 
> Add turbostat support for RAPTORLAKE_S platform, which behaves the same
> as RAPTORLAKE and RAPTORLAKE_P platforms.
> 
> RPL-S 601/801 have different CPU ID than the Hybrid ADL-S platforms.
> 
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> (cherry picked from https://patchwork.kernel.org/project/linux-pm/patch/20220831064957.1773-1-rui.zhang@intel.com/)
> Signed-off-by: Koba Ko <koba.ko@canonical.com>

This patch is now in Linus' tree with sha1
9b1c2ecfa02bc2645e6e9d55f0f39bc191991270.

The necessary changes (e.g. remove SAUCE, fix-up the provenance block, etc)
can be done when applying the patch to the remaining kernels.

Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

Thanks

> ---
>   tools/power/x86/turbostat/turbostat.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
> index 831dc32d45fad..df040d87edd84 100644
> --- a/tools/power/x86/turbostat/turbostat.c
> +++ b/tools/power/x86/turbostat/turbostat.c
> @@ -5447,6 +5447,7 @@ unsigned int intel_model_duplicates(unsigned int model)
>   	case INTEL_FAM6_ALDERLAKE_N:
>   	case INTEL_FAM6_RAPTORLAKE:
>   	case INTEL_FAM6_RAPTORLAKE_P:
> +	case INTEL_FAM6_RAPTORLAKE_S:
>   		return INTEL_FAM6_CANNONLAKE_L;
>   
>   	case INTEL_FAM6_ATOM_TREMONT_L:
diff mbox series

Patch

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 831dc32d45fad..df040d87edd84 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -5447,6 +5447,7 @@  unsigned int intel_model_duplicates(unsigned int model)
 	case INTEL_FAM6_ALDERLAKE_N:
 	case INTEL_FAM6_RAPTORLAKE:
 	case INTEL_FAM6_RAPTORLAKE_P:
+	case INTEL_FAM6_RAPTORLAKE_S:
 		return INTEL_FAM6_CANNONLAKE_L;
 
 	case INTEL_FAM6_ATOM_TREMONT_L: