From: Brian Bian <brian.bian@intel.com>
Date: Tue, 14 Apr 2015 17:53:35 +0000 (-0700)
Subject: powercap / RAPL: Add support for Intel Skylake processors
X-Git-Tag: firefly_0821_release~176^2~1854^2~1^3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5fa0fa4b01cd9c52c4be0ff69ce0d922cd724812;p=firefly-linux-kernel-4.4.55.git

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>
---

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 */