diff options
author | Joe Konno <joe.konno@intel.com> | 2018-03-02 10:32:51 -0800 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-03-19 00:02:24 +0100 |
commit | ef74b5bf22704bb1e7b67396704bbb41e1df0e39 (patch) | |
tree | 02393f6f4497c9dbf096090b183269e31c0cd058 /drivers/powercap/intel_rapl.c | |
parent | 0c8efd610b58cb23cefdfa12015799079aef94ae (diff) | |
download | linux-stable-ef74b5bf22704bb1e7b67396704bbb41e1df0e39.tar.gz linux-stable-ef74b5bf22704bb1e7b67396704bbb41e1df0e39.tar.bz2 linux-stable-ef74b5bf22704bb1e7b67396704bbb41e1df0e39.zip |
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 <joe.konno@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/powercap/intel_rapl.c')
-rw-r--r-- | drivers/powercap/intel_rapl.c | 1 |
1 files changed, 1 insertions, 0 deletions
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), |