summaryrefslogtreecommitdiffstats
path: root/drivers/powercap
diff options
context:
space:
mode:
authorBrian Bian <brian.bian@intel.com>2015-04-14 10:53:35 -0700
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-15 23:06:16 +0200
commit5fa0fa4b01cd9c52c4be0ff69ce0d922cd724812 (patch)
tree21fd3b7523243c49d32501dea3fd37a9d886f225 /drivers/powercap
parentea85dbcaec0ff29f2c3f84be4c8a01a94e8bd449 (diff)
downloadlinux-5fa0fa4b01cd9c52c4be0ff69ce0d922cd724812.tar.gz
linux-5fa0fa4b01cd9c52c4be0ff69ce0d922cd724812.tar.bz2
linux-5fa0fa4b01cd9c52c4be0ff69ce0d922cd724812.zip
powercap / RAPL: Add support for Intel Skylake processors
Signed-off-by: Brian Bian <brian.bian@intel.com> Acked-by: Jacob Pan <jacob.jun.pan@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/powercap')
-rw-r--r--drivers/powercap/intel_rapl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index e03877c4b195..fd243231620a 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -1064,6 +1064,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
RAPL_CPU(0x3f, rapl_defaults_hsw_server),/* Haswell servers */
RAPL_CPU(0x4f, rapl_defaults_hsw_server),/* Broadwell servers */
RAPL_CPU(0x45, rapl_defaults_core),/* Haswell ULT */
+ RAPL_CPU(0x4E, rapl_defaults_core),/* Skylake */
RAPL_CPU(0x4C, rapl_defaults_atom),/* Braswell */
RAPL_CPU(0x4A, rapl_defaults_atom),/* Tangier */
RAPL_CPU(0x56, rapl_defaults_core),/* Future Xeon */