summaryrefslogtreecommitdiffstats
path: root/drivers/powercap
diff options
context:
space:
mode:
authorJason Baron <jbaron@akamai.com>2014-08-14 14:26:08 +0000
committerLuis Henriques <luis.henriques@canonical.com>2015-01-15 10:44:49 +0000
commit932d760fa5203f812a5e16fd6e7732d6beb0ff28 (patch)
treea32a47ffb43414a74fac5d6af2bad880435548f5 /drivers/powercap
parentf41320c4e6595c334b4a5b039640c30da228f3a1 (diff)
downloadlinux-stable-932d760fa5203f812a5e16fd6e7732d6beb0ff28.tar.gz
linux-stable-932d760fa5203f812a5e16fd6e7732d6beb0ff28.tar.bz2
linux-stable-932d760fa5203f812a5e16fd6e7732d6beb0ff28.zip
powercap / RAPL: add support for CPU model 0x3f
commit 64c7569c065564a066bb44161f904b4afc9f3e3a upstream. I've confirmed that monitoring the package power usage as well as setting power limits appear to be working as expected. Supports the package and dram domains. Tested aginst cpu: Intel(R) Xeon(R) CPU E5-2650 v3 @ 2.30GHz Signed-off-by: Jason Baron <jbaron@akamai.com> Acked-by: Jacob Pan <jacob.jun.pan@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Cc: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Luis Henriques <luis.henriques@canonical.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 b1cda6ffdbcc..a362dcc20ec0 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -953,6 +953,7 @@ static const struct x86_cpu_id rapl_ids[] = {
{ X86_VENDOR_INTEL, 6, 0x3a},/* Ivy Bridge */
{ X86_VENDOR_INTEL, 6, 0x3c},/* Haswell */
{ X86_VENDOR_INTEL, 6, 0x3d},/* Broadwell */
+ { X86_VENDOR_INTEL, 6, 0x3f},/* Haswell */
{ X86_VENDOR_INTEL, 6, 0x45},/* Haswell ULT */
/* TODO: Add more CPU IDs after testing */
{}