Messages in this thread Patch in this message | | | Date | Wed, 8 Jun 2016 07:14:15 -0700 | From | tip-bot for Dave Hansen <> | Subject | [tip:x86/cpu] x86, powercap, rapl: Add Skylake Server model number |
| |
Commit-ID: d40671e30cb46e834651e0ce3d4590c915171414 Gitweb: http://git.kernel.org/tip/d40671e30cb46e834651e0ce3d4590c915171414 Author: Dave Hansen <dave.hansen@linux.intel.com> AuthorDate: Thu, 2 Jun 2016 17:19:55 -0700 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Wed, 8 Jun 2016 13:03:25 +0200
x86, powercap, rapl: Add Skylake Server model number
SKX uses similar RAPL interface as Broadwell server according to Jacob Pan.
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Dave Hansen <dave@sr71.net> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Jacob Pan <jacob.jun.pan@linux.intel.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rafael J. Wysocki <rjw@rjwysocki.net> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: jacob.jun.pan@intel.com Cc: linux-pm@vger.kernel.org Link: http://lkml.kernel.org/r/20160603001955.38E1E684@viggo.jf.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org> --- drivers/powercap/intel_rapl.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c index f4f8532..2e8f2be 100644 --- a/drivers/powercap/intel_rapl.c +++ b/drivers/powercap/intel_rapl.c @@ -1114,6 +1114,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { RAPL_CPU(INTEL_FAM6_SKYLAKE_DESKTOP, rapl_defaults_core), RAPL_CPU(INTEL_FAM6_SKYLAKE_MOBILE, rapl_defaults_core), + RAPL_CPU(INTEL_FAM6_SKYLAKE_X, rapl_defaults_hsw_server), RAPL_CPU(INTEL_FAM6_KABYLAKE_MOBILE, rapl_defaults_core), RAPL_CPU(INTEL_FAM6_KABYLAKE_DESKTOP, rapl_defaults_core),
| |