Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bb04b5f authored by Dave Hansen's avatar Dave Hansen Committed by Ingo Molnar
Browse files

x86, powercap, rapl: Reorder CPU detection table 



Let's make an effort to group these things by microarchitecture
name.  It makes it easier to see if something got missed.

Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Acked-by: default avatarRafael J. Wysocki <rjw@rjwysocki.net>
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: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: jacob.jun.pan@intel.com
Cc: linux-pm@vger.kernel.org
Link: http://lkml.kernel.org/r/20160603001937.B53A383A@viggo.jf.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 62d16733

drivers/powercap/intel_rapl.c

+14 −8
Original line number Diff line number Diff line
@@ -1099,25 +1099,31 @@ static const struct rapl_defaults rapl_defaults_cht = { 
static const struct x86_cpu_id rapl_ids[] __initconst = {

	RAPL_CPU(INTEL_FAM6_SANDYBRIDGE,	rapl_defaults_core),

	RAPL_CPU(INTEL_FAM6_SANDYBRIDGE_X,	rapl_defaults_core),

	RAPL_CPU(INTEL_FAM6_ATOM_SILVERMONT1,	rapl_defaults_byt),



	RAPL_CPU(INTEL_FAM6_IVYBRIDGE,		rapl_defaults_core),



	RAPL_CPU(INTEL_FAM6_HASWELL_CORE,	rapl_defaults_core),

	RAPL_CPU(INTEL_FAM6_BROADWELL_CORE,	rapl_defaults_core),

	RAPL_CPU(INTEL_FAM6_HASWELL_X,		rapl_defaults_hsw_server),

	RAPL_CPU(INTEL_FAM6_BROADWELL_X,	rapl_defaults_hsw_server),

	RAPL_CPU(INTEL_FAM6_HASWELL_ULT,	rapl_defaults_core),

	RAPL_CPU(INTEL_FAM6_HASWELL_GT3E,	rapl_defaults_core),

	RAPL_CPU(INTEL_FAM6_HASWELL_X,		rapl_defaults_hsw_server),



	RAPL_CPU(INTEL_FAM6_BROADWELL_CORE,	rapl_defaults_core),

	RAPL_CPU(INTEL_FAM6_BROADWELL_GT3E,	rapl_defaults_core),

	RAPL_CPU(INTEL_FAM6_BROADWELL_XEON_D,	rapl_defaults_core),

	RAPL_CPU(INTEL_FAM6_BROADWELL_X,	rapl_defaults_hsw_server),



	RAPL_CPU(INTEL_FAM6_SKYLAKE_DESKTOP,	rapl_defaults_core),

	RAPL_CPU(INTEL_FAM6_SKYLAKE_MOBILE,	rapl_defaults_core),

	RAPL_CPU(INTEL_FAM6_KABYLAKE_MOBILE,	rapl_defaults_core),

	RAPL_CPU(INTEL_FAM6_KABYLAKE_DESKTOP,	rapl_defaults_core),



	RAPL_CPU(INTEL_FAM6_ATOM_SILVERMONT1,	rapl_defaults_byt),

	RAPL_CPU(INTEL_FAM6_ATOM_AIRMONT,	rapl_defaults_cht),

	RAPL_CPU(INTEL_FAM6_ATOM_MERRIFIELD1,	rapl_defaults_tng),

	RAPL_CPU(INTEL_FAM6_BROADWELL_XEON_D,	rapl_defaults_core),

	RAPL_CPU(INTEL_FAM6_ATOM_MERRIFIELD2,	rapl_defaults_ann),

	RAPL_CPU(INTEL_FAM6_ATOM_GOLDMONT,	rapl_defaults_core),

	RAPL_CPU(INTEL_FAM6_SKYLAKE_DESKTOP,	rapl_defaults_core),



	RAPL_CPU(INTEL_FAM6_XEON_PHI_KNL,	rapl_defaults_hsw_server),

	RAPL_CPU(INTEL_FAM6_KABYLAKE_MOBILE,	rapl_defaults_core),

	RAPL_CPU(INTEL_FAM6_KABYLAKE_DESKTOP,	rapl_defaults_core),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, rapl_ids);