[PATCH 08/20] x86, rapl: reorder cpu detection table

[Dave Hansen]

From: Dave Hansen <dave.han...@linux.intel.com>

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: Dave Hansen <dave.han...@linux.intel.com>
Cc: "Rafael J. Wysocki" <r...@rjwysocki.net>
Cc: linux...@vger.kernel.org
---

 b/drivers/powercap/intel_rapl.c |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff -puN 
drivers/powercap/intel_rapl.c~x86-intel-familites-powercap-rapl-reorder 
drivers/powercap/intel_rapl.c
--- a/drivers/powercap/intel_rapl.c~x86-intel-familites-powercap-rapl-reorder   
2016-06-01 15:45:05.931023874 -0700
+++ b/drivers/powercap/intel_rapl.c     2016-06-01 15:45:05.936024102 -0700
@@ -1099,25 +1099,31 @@ static const struct rapl_defaults rapl_d
 static const struct x86_cpu_id rapl_ids[] __initconst = {
        RAPL_CPU(INTEL_FAM6_MODEL_SANDYBRIDGE,          rapl_defaults_core),
        RAPL_CPU(INTEL_FAM6_MODEL_SANDYBRIDGE_X,        rapl_defaults_core),
-       RAPL_CPU(INTEL_FAM6_MODEL_ATOM_SILVERMONT1,     rapl_defaults_byt),
+
        RAPL_CPU(INTEL_FAM6_MODEL_IVYBRIDGE,            rapl_defaults_core),
+
        RAPL_CPU(INTEL_FAM6_MODEL_HASWELL_CORE,         rapl_defaults_core),
-       RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_CORE_M,     rapl_defaults_core),
-       RAPL_CPU(INTEL_FAM6_MODEL_HASWELL_X,            
rapl_defaults_hsw_server),
-       RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_X,          
rapl_defaults_hsw_server),
        RAPL_CPU(INTEL_FAM6_MODEL_HASWELL_ULT,          rapl_defaults_core),
        RAPL_CPU(INTEL_FAM6_MODEL_HASWELL_GT3E,         rapl_defaults_core),
+       RAPL_CPU(INTEL_FAM6_MODEL_HASWELL_X,            
rapl_defaults_hsw_server),
+
+       RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_CORE_M,     rapl_defaults_core),
        RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_GT3E,       rapl_defaults_core),
+       RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_XEON_D,     rapl_defaults_core),
+       RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_X,          
rapl_defaults_hsw_server),
+
+       RAPL_CPU(INTEL_FAM6_MODEL_SKYLAKE_DESKTOP,      rapl_defaults_core),
        RAPL_CPU(INTEL_FAM6_MODEL_SKYLAKE_MOBILE,       rapl_defaults_core),
+       RAPL_CPU(INTEL_FAM6_MODEL_KABYLAKE_MOBILE,      rapl_defaults_core),
+       RAPL_CPU(INTEL_FAM6_MODEL_KABYLAKE_DESKTOP,     rapl_defaults_core),
+
+       RAPL_CPU(INTEL_FAM6_MODEL_ATOM_SILVERMONT1,     rapl_defaults_byt),
        RAPL_CPU(INTEL_FAM6_MODEL_ATOM_AIRMONT,         rapl_defaults_cht),
        RAPL_CPU(INTEL_FAM6_MODEL_ATOM_MERRIFIELD1,     rapl_defaults_tng),
-       RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_XEON_D,     rapl_defaults_core),
        RAPL_CPU(INTEL_FAM6_MODEL_ATOM_MERRIFIELD2,     rapl_defaults_ann),
        RAPL_CPU(INTEL_FAM6_MODEL_ATOM_GOLDMONT,        rapl_defaults_core),
-       RAPL_CPU(INTEL_FAM6_MODEL_SKYLAKE_DESKTOP,      rapl_defaults_core),
+
        RAPL_CPU(INTEL_FAM6_MODEL_XEON_PHI_KNL,         
rapl_defaults_hsw_server),
-       RAPL_CPU(INTEL_FAM6_MODEL_KABYLAKE_MOBILE,      rapl_defaults_core),
-       RAPL_CPU(INTEL_FAM6_MODEL_KABYLAKE_DESKTOP,     rapl_defaults_core),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, rapl_ids);
_