From: Dave Hansen <dave.han...@linux.intel.com>
Another straightforward replacement of magic numbers
Signed-off-by: Dave Hansen <dave.han...@linux.intel.com>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Ingo Molnar <mi...@redhat.com>
Cc: "H. Peter Anvin" <h...@zytor.com>
---
b/arch/x86/events/intel/uncore.c | 41 +++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff -puN arch/x86/events/intel/uncore.c~x86-intel-familites-uncore
arch/x86/events/intel/uncore.c
--- a/arch/x86/events/intel/uncore.c~x86-intel-familites-uncore 2016-06-01
15:45:07.229083068 -0700
+++ b/arch/x86/events/intel/uncore.c 2016-06-01 15:45:07.238083478 -0700
@@ -1,4 +1,5 @@
#include <asm/cpu_device_id.h>
+#include <asm/intel-family.h>
#include "uncore.h"
static struct intel_uncore_type *empty_uncore[] = { NULL, };
@@ -1365,26 +1366,26 @@ static const struct intel_uncore_init_fu
};
static const struct x86_cpu_id intel_uncore_match[] __initconst = {
- X86_UNCORE_MODEL_MATCH(26, nhm_uncore_init), /* Nehalem */
- X86_UNCORE_MODEL_MATCH(30, nhm_uncore_init),
- X86_UNCORE_MODEL_MATCH(37, nhm_uncore_init), /* Westmere */
- X86_UNCORE_MODEL_MATCH(44, nhm_uncore_init),
- X86_UNCORE_MODEL_MATCH(42, snb_uncore_init), /* Sandy Bridge */
- X86_UNCORE_MODEL_MATCH(58, ivb_uncore_init), /* Ivy Bridge */
- X86_UNCORE_MODEL_MATCH(60, hsw_uncore_init), /* Haswell */
- X86_UNCORE_MODEL_MATCH(69, hsw_uncore_init), /* Haswell Celeron */
- X86_UNCORE_MODEL_MATCH(70, hsw_uncore_init), /* Haswell */
- X86_UNCORE_MODEL_MATCH(61, bdw_uncore_init), /* Broadwell */
- X86_UNCORE_MODEL_MATCH(71, bdw_uncore_init), /* Broadwell */
- X86_UNCORE_MODEL_MATCH(45, snbep_uncore_init), /* Sandy Bridge-EP */
- X86_UNCORE_MODEL_MATCH(46, nhmex_uncore_init), /* Nehalem-EX */
- X86_UNCORE_MODEL_MATCH(47, nhmex_uncore_init), /* Westmere-EX aka.
Xeon E7 */
- X86_UNCORE_MODEL_MATCH(62, ivbep_uncore_init), /* Ivy Bridge-EP */
- X86_UNCORE_MODEL_MATCH(63, hswep_uncore_init), /* Haswell-EP */
- X86_UNCORE_MODEL_MATCH(79, bdx_uncore_init), /* BDX-EP */
- X86_UNCORE_MODEL_MATCH(86, bdx_uncore_init), /* BDX-DE */
- X86_UNCORE_MODEL_MATCH(87, knl_uncore_init), /* Knights Landing */
- X86_UNCORE_MODEL_MATCH(94, skl_uncore_init), /* SkyLake */
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_NEHALEM_EP,
nhm_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_NEHALEM,
nhm_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_WESTMERE,
nhm_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_WESTMERE_EP,
nhm_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_SANDYBRIDGE,
snb_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_IVYBRIDGE,
ivb_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_HASWELL_CORE,
hsw_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_HASWELL_ULT,
hsw_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_HASWELL_GT3E,
hsw_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_BROADWELL_CORE_M,
bdw_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_BROADWELL_GT3E,
bdw_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_SANDYBRIDGE_X,
snbep_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_NEHALEM_EX,
nhmex_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_WESTMERE_EX,
nhmex_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_IVYBRIDGE_X,
ivbep_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_HASWELL_X,
hswep_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_BROADWELL_X,
bdx_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_BROADWELL_XEON_D,
bdx_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_XEON_PHI_KNL,
knl_uncore_init),
+ X86_UNCORE_MODEL_MATCH(INTEL_FAM6_MODEL_SKYLAKE_DESKTOP,
skl_uncore_init),
{},
};
_
