summaryrefslogtreecommitdiffstats
path: root/drivers/powercap
diff options
context:
space:
mode:
authorJacob Pan <jacob.jun.pan@linux.intel.com>2014-04-29 15:33:07 -0700
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-05-01 01:34:51 +0200
commita97ac35b5d9e948ccfcbc04c69e9d2c94e788e94 (patch)
treef3eeb3c504c6eeda822f87c86786981cd5fd8e88 /drivers/powercap
parent9d31c676c6019df0c078950a0ddca87da4706b14 (diff)
downloadop-kernel-dev-a97ac35b5d9e948ccfcbc04c69e9d2c94e788e94.zip
op-kernel-dev-a97ac35b5d9e948ccfcbc04c69e9d2c94e788e94.tar.gz
powercap / RAPL: add new CPU IDs
Add support for Broadwell model 0x3d and Haswell model (0x3c). Signed-off-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.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index 1c987d2..b1cda6f 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -951,7 +951,9 @@ static const struct x86_cpu_id rapl_ids[] = {
{ X86_VENDOR_INTEL, 6, 0x2d},/* Sandy Bridge EP */
{ X86_VENDOR_INTEL, 6, 0x37},/* Valleyview */
{ X86_VENDOR_INTEL, 6, 0x3a},/* Ivy Bridge */
- { X86_VENDOR_INTEL, 6, 0x45},/* Haswell */
+ { X86_VENDOR_INTEL, 6, 0x3c},/* Haswell */
+ { X86_VENDOR_INTEL, 6, 0x3d},/* Broadwell */
+ { X86_VENDOR_INTEL, 6, 0x45},/* Haswell ULT */
/* TODO: Add more CPU IDs after testing */
{}
};
OpenPOWER on IntegriCloud