summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>2016-03-26 05:03:38 -0700
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-04-05 03:44:48 +0200
commit462d8083fb2da951ad6edb9e8000c1f2578d27a9 (patch)
treef10e9384fb029ec334becbee14becda1a5123e1e
parent323ee64aa175a67fbbe744e809777d17e6fb42d7 (diff)
downloadop-kernel-dev-462d8083fb2da951ad6edb9e8000c1f2578d27a9.zip
op-kernel-dev-462d8083fb2da951ad6edb9e8000c1f2578d27a9.tar.gz
powercap: intel_rapl: Add missing Haswell model
Added missing model 0x46. Tested-and-reported-by: Piotr Maksymiuk <piotr.maksymiuk@movishell.pl> Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-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 cdfd01f0..8fad0a7 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -1091,6 +1091,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(0x46, rapl_defaults_core),/* Haswell */
RAPL_CPU(0x47, rapl_defaults_core),/* Broadwell-H */
RAPL_CPU(0x4E, rapl_defaults_core),/* Skylake */
RAPL_CPU(0x4C, rapl_defaults_cht),/* Braswell/Cherryview */
OpenPOWER on IntegriCloud