From: Joe Konno Date: Fri, 2 Mar 2018 18:32:51 +0000 (-0800) Subject: powercap: RAPL: Add support for Cannon Lake X-Git-Tag: v4.17-rc1~159^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef74b5bf22704bb1e7b67396704bbb41e1df0e39;p=thirdparty%2Fkernel%2Flinux.git powercap: RAPL: Add support for Cannon Lake RAPL MSRs and handling for Cannon Lake are similar to Sky Lake and Kaby Lake. Signed-off-by: Joe Konno Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c index 35636e1d8a3d8..295d8dcba48cd 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),