2018-03-02 21:06:54

by Joe Konno

Subject: [PATCH] powercap / RAPL: add support for Cannon Lake

From: Joe Konno <[email protected]>

RAPL MSRs and handling for Cannon Lake are similar to Sky Lake and Kaby
Lake.

Signed-off-by: Joe Konno <[email protected]>
---
drivers/powercap/intel_rapl.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index 35636e1d8a3d..295d8dcba48c 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -1162,6 +1162,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
RAPL_CPU(INTEL_FAM6_SKYLAKE_X, rapl_defaults_hsw_server),
RAPL_CPU(INTEL_FAM6_KABYLAKE_MOBILE, rapl_defaults_core),
RAPL_CPU(INTEL_FAM6_KABYLAKE_DESKTOP, rapl_defaults_core),
+ RAPL_CPU(INTEL_FAM6_CANNONLAKE_MOBILE, rapl_defaults_core),

RAPL_CPU(INTEL_FAM6_ATOM_SILVERMONT1, rapl_defaults_byt),
RAPL_CPU(INTEL_FAM6_ATOM_AIRMONT, rapl_defaults_cht),
--
2.14.1

2018-03-20 17:10:32

by Rafael J. Wysocki

Subject: Re: [PATCH] powercap / RAPL: add support for Cannon Lake

On Friday, March 2, 2018 7:32:51 PM CET Joe Konno wrote:
> From: Joe Konno <[email protected]>
>
> RAPL MSRs and handling for Cannon Lake are similar to Sky Lake and Kaby
> Lake.
>
> Signed-off-by: Joe Konno <[email protected]>
> ---
> drivers/powercap/intel_rapl.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
> index 35636e1d8a3d..295d8dcba48c 100644
> --- a/drivers/powercap/intel_rapl.c
> +++ b/drivers/powercap/intel_rapl.c
> @@ -1162,6 +1162,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
> RAPL_CPU(INTEL_FAM6_SKYLAKE_X, rapl_defaults_hsw_server),
> RAPL_CPU(INTEL_FAM6_KABYLAKE_MOBILE, rapl_defaults_core),
> RAPL_CPU(INTEL_FAM6_KABYLAKE_DESKTOP, rapl_defaults_core),
> + RAPL_CPU(INTEL_FAM6_CANNONLAKE_MOBILE, rapl_defaults_core),
>
> RAPL_CPU(INTEL_FAM6_ATOM_SILVERMONT1, rapl_defaults_byt),
> RAPL_CPU(INTEL_FAM6_ATOM_AIRMONT, rapl_defaults_cht),
>

Applied, thanks!