Skip to content

Commit 629b3df

Browse files
author
Ingo Molnar
committed
Merge branch 'x86/cpu' into perf/core, to resolve conflict
Conflicts: arch/x86/events/intel/uncore.c Signed-off-by: Ingo Molnar <[email protected]>
2 parents 3442a9e + d978280 commit 629b3df

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+532
-481
lines changed

‎arch/x86/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1875,7 +1875,6 @@ config X86_SMAP
18751875

18761876
config X86_UMIP
18771877
def_bool y
1878-
depends on CPU_SUP_INTEL || CPU_SUP_AMD
18791878
prompt "User Mode Instruction Prevention" if EXPERT
18801879
---help---
18811880
User Mode Instruction Prevention (UMIP) is a security feature in

‎arch/x86/crypto/aesni-intel_glue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1064,7 +1064,7 @@ static struct aead_alg aesni_aeads[0];
10641064
static struct simd_aead_alg *aesni_simd_aeads[ARRAY_SIZE(aesni_aeads)];
10651065

10661066
static const struct x86_cpu_id aesni_cpu_id[] = {
1067-
X86_FEATURE_MATCH(X86_FEATURE_AES),
1067+
X86_MATCH_FEATURE(X86_FEATURE_AES, NULL),
10681068
{}
10691069
};
10701070
MODULE_DEVICE_TABLE(x86cpu, aesni_cpu_id);

‎arch/x86/crypto/crc32-pclmul_glue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ static struct shash_alg alg = {
170170
};
171171

172172
static const struct x86_cpu_id crc32pclmul_cpu_id[] = {
173-
X86_FEATURE_MATCH(X86_FEATURE_PCLMULQDQ),
173+
X86_MATCH_FEATURE(X86_FEATURE_PCLMULQDQ, NULL),
174174
{}
175175
};
176176
MODULE_DEVICE_TABLE(x86cpu, crc32pclmul_cpu_id);

‎arch/x86/crypto/crc32c-intel_glue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ static struct shash_alg alg = {
221221
};
222222

223223
static const struct x86_cpu_id crc32c_cpu_id[] = {
224-
X86_FEATURE_MATCH(X86_FEATURE_XMM4_2),
224+
X86_MATCH_FEATURE(X86_FEATURE_XMM4_2, NULL),
225225
{}
226226
};
227227
MODULE_DEVICE_TABLE(x86cpu, crc32c_cpu_id);

‎arch/x86/crypto/crct10dif-pclmul_glue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ static struct shash_alg alg = {
114114
};
115115

116116
static const struct x86_cpu_id crct10dif_cpu_id[] = {
117-
X86_FEATURE_MATCH(X86_FEATURE_PCLMULQDQ),
117+
X86_MATCH_FEATURE(X86_FEATURE_PCLMULQDQ, NULL),
118118
{}
119119
};
120120
MODULE_DEVICE_TABLE(x86cpu, crct10dif_cpu_id);

‎arch/x86/crypto/ghash-clmulni-intel_glue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ static struct ahash_alg ghash_async_alg = {
313313
};
314314

315315
static const struct x86_cpu_id pcmul_cpu_id[] = {
316-
X86_FEATURE_MATCH(X86_FEATURE_PCLMULQDQ), /* Pickle-Mickle-Duck */
316+
X86_MATCH_FEATURE(X86_FEATURE_PCLMULQDQ, NULL), /* Pickle-Mickle-Duck */
317317
{}
318318
};
319319
MODULE_DEVICE_TABLE(x86cpu, pcmul_cpu_id);

‎arch/x86/events/amd/power.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ static int power_cpu_init(unsigned int cpu)
259259
}
260260

261261
static const struct x86_cpu_id cpu_match[] = {
262-
{ .vendor = X86_VENDOR_AMD, .family = 0x15 },
262+
X86_MATCH_VENDOR_FAM(AMD, 0x15, NULL),
263263
{},
264264
};
265265

‎arch/x86/events/intel/cstate.c

Lines changed: 40 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -594,63 +594,60 @@ static const struct cstate_model glm_cstates __initconst = {
594594
};
595595

596596

597-
#define X86_CSTATES_MODEL(model, states) \
598-
{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long) &(states) }
599-
600597
static const struct x86_cpu_id intel_cstates_match[] __initconst = {
601-
X86_CSTATES_MODEL(INTEL_FAM6_NEHALEM, nhm_cstates),
602-
X86_CSTATES_MODEL(INTEL_FAM6_NEHALEM_EP, nhm_cstates),
603-
X86_CSTATES_MODEL(INTEL_FAM6_NEHALEM_EX, nhm_cstates),
598+
X86_MATCH_INTEL_FAM6_MODEL(NEHALEM, &nhm_cstates),
599+
X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EP, &nhm_cstates),
600+
X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EX, &nhm_cstates),
604601

605-
X86_CSTATES_MODEL(INTEL_FAM6_WESTMERE, nhm_cstates),
606-
X86_CSTATES_MODEL(INTEL_FAM6_WESTMERE_EP, nhm_cstates),
607-
X86_CSTATES_MODEL(INTEL_FAM6_WESTMERE_EX, nhm_cstates),
602+
X86_MATCH_INTEL_FAM6_MODEL(WESTMERE, &nhm_cstates),
603+
X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EP, &nhm_cstates),
604+
X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EX, &nhm_cstates),
608605

609-
X86_CSTATES_MODEL(INTEL_FAM6_SANDYBRIDGE, snb_cstates),
610-
X86_CSTATES_MODEL(INTEL_FAM6_SANDYBRIDGE_X, snb_cstates),
606+
X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE, &snb_cstates),
607+
X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X, &snb_cstates),
611608

612-
X86_CSTATES_MODEL(INTEL_FAM6_IVYBRIDGE, snb_cstates),
613-
X86_CSTATES_MODEL(INTEL_FAM6_IVYBRIDGE_X, snb_cstates),
609+
X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE, &snb_cstates),
610+
X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X, &snb_cstates),
614611

615-
X86_CSTATES_MODEL(INTEL_FAM6_HASWELL, snb_cstates),
616-
X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_X, snb_cstates),
617-
X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_G, snb_cstates),
612+
X86_MATCH_INTEL_FAM6_MODEL(HASWELL, &snb_cstates),
613+
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X, &snb_cstates),
614+
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_G, &snb_cstates),
618615

619-
X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_L, hswult_cstates),
616+
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_L, &hswult_cstates),
620617

621-
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_SILVERMONT, slm_cstates),
622-
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_SILVERMONT_D, slm_cstates),
623-
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_AIRMONT, slm_cstates),
618+
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, &slm_cstates),
619+
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_D, &slm_cstates),
620+
X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, &slm_cstates),
624621

625-
X86_CSTATES_MODEL(INTEL_FAM6_BROADWELL, snb_cstates),
626-
X86_CSTATES_MODEL(INTEL_FAM6_BROADWELL_D, snb_cstates),
627-
X86_CSTATES_MODEL(INTEL_FAM6_BROADWELL_G, snb_cstates),
628-
X86_CSTATES_MODEL(INTEL_FAM6_BROADWELL_X, snb_cstates),
622+
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL, &snb_cstates),
623+
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, &snb_cstates),
624+
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, &snb_cstates),
625+
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, &snb_cstates),
629626

630-
X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_L, snb_cstates),
631-
X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE, snb_cstates),
632-
X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_X, snb_cstates),
627+
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, &snb_cstates),
628+
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &snb_cstates),
629+
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, &snb_cstates),
633630

634-
X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_L, hswult_cstates),
635-
X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE, hswult_cstates),
636-
X86_CSTATES_MODEL(INTEL_FAM6_COMETLAKE_L, hswult_cstates),
637-
X86_CSTATES_MODEL(INTEL_FAM6_COMETLAKE, hswult_cstates),
631+
X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, &hswult_cstates),
632+
X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, &hswult_cstates),
633+
X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &hswult_cstates),
634+
X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &hswult_cstates),
638635

639-
X86_CSTATES_MODEL(INTEL_FAM6_CANNONLAKE_L, cnl_cstates),
636+
X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, &cnl_cstates),
640637

641-
X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNL, knl_cstates),
642-
X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNM, knl_cstates),
638+
X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL, &knl_cstates),
639+
X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM, &knl_cstates),
643640

644-
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT, glm_cstates),
645-
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT_D, glm_cstates),
646-
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT_PLUS, glm_cstates),
647-
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_TREMONT_D, glm_cstates),
648-
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_TREMONT, glm_cstates),
641+
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &glm_cstates),
642+
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_D, &glm_cstates),
643+
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &glm_cstates),
644+
X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &glm_cstates),
645+
X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT, &glm_cstates),
649646

650-
X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE_L, icl_cstates),
651-
X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE, icl_cstates),
652-
X86_CSTATES_MODEL(INTEL_FAM6_TIGERLAKE_L, icl_cstates),
653-
X86_CSTATES_MODEL(INTEL_FAM6_TIGERLAKE, icl_cstates),
647+
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, &icl_cstates),
648+
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, &icl_cstates),
649+
X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, &icl_cstates),
650+
X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, &icl_cstates),
654651
{ },
655652
};
656653
MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);

‎arch/x86/events/intel/rapl.c

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -668,9 +668,6 @@ static int __init init_rapl_pmus(void)
668668
return 0;
669669
}
670670

671-
#define X86_RAPL_MODEL_MATCH(model, init) \
672-
{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&init }
673-
674671
static struct rapl_model model_snb = {
675672
.events = BIT(PERF_RAPL_PP0) |
676673
BIT(PERF_RAPL_PKG) |
@@ -716,36 +713,35 @@ static struct rapl_model model_skl = {
716713
};
717714

718715
static const struct x86_cpu_id rapl_model_match[] __initconst = {
719-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_SANDYBRIDGE, model_snb),
720-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_SANDYBRIDGE_X, model_snbep),
721-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_IVYBRIDGE, model_snb),
722-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_IVYBRIDGE_X, model_snbep),
723-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_HASWELL, model_hsw),
724-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_HASWELL_X, model_hsx),
725-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_HASWELL_L, model_hsw),
726-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_HASWELL_G, model_hsw),
727-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL, model_hsw),
728-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_G, model_hsw),
729-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_X, model_hsx),
730-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_D, model_hsx),
731-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNL, model_knl),
732-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNM, model_knl),
733-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_L, model_skl),
734-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE, model_skl),
735-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_X, model_hsx),
736-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_KABYLAKE_L, model_skl),
737-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_KABYLAKE, model_skl),
738-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_CANNONLAKE_L, model_skl),
739-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT, model_hsw),
740-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_D, model_hsw),
741-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_PLUS, model_hsw),
742-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_L, model_skl),
743-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE, model_skl),
744-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_COMETLAKE_L, model_skl),
745-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_COMETLAKE, model_skl),
716+
X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE, &model_snb),
717+
X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X, &model_snbep),
718+
X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE, &model_snb),
719+
X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X, &model_snbep),
720+
X86_MATCH_INTEL_FAM6_MODEL(HASWELL, &model_hsw),
721+
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X, &model_hsx),
722+
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_L, &model_hsw),
723+
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_G, &model_hsw),
724+
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL, &model_hsw),
725+
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, &model_hsw),
726+
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, &model_hsx),
727+
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, &model_hsx),
728+
X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL, &model_knl),
729+
X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM, &model_knl),
730+
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, &model_skl),
731+
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &model_skl),
732+
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, &model_hsx),
733+
X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, &model_skl),
734+
X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, &model_skl),
735+
X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, &model_skl),
736+
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &model_hsw),
737+
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_D, &model_hsw),
738+
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &model_hsw),
739+
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, &model_skl),
740+
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, &model_skl),
741+
X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &model_skl),
742+
X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &model_skl),
746743
{},
747744
};
748-
749745
MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);
750746

751747
static int __init rapl_pmu_init(void)

‎arch/x86/events/intel/uncore.c

Lines changed: 31 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,10 +1392,6 @@ static int __init uncore_mmio_init(void)
13921392
return ret;
13931393
}
13941394

1395-
1396-
#define X86_UNCORE_MODEL_MATCH(model, init) \
1397-
{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&init }
1398-
13991395
struct intel_uncore_init_fun {
14001396
void (*cpu_init)(void);
14011397
int (*pci_init)(void);
@@ -1487,40 +1483,39 @@ static const struct intel_uncore_init_fun snr_uncore_init __initconst = {
14871483
};
14881484

14891485
static const struct x86_cpu_id intel_uncore_match[] __initconst = {
1490-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_NEHALEM_EP, nhm_uncore_init),
1491-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_NEHALEM, nhm_uncore_init),
1492-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_WESTMERE, nhm_uncore_init),
1493-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_WESTMERE_EP, nhm_uncore_init),
1494-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SANDYBRIDGE, snb_uncore_init),
1495-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_IVYBRIDGE, ivb_uncore_init),
1496-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL, hsw_uncore_init),
1497-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL_L, hsw_uncore_init),
1498-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL_G, hsw_uncore_init),
1499-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL, bdw_uncore_init),
1500-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_G, bdw_uncore_init),
1501-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SANDYBRIDGE_X, snbep_uncore_init),
1502-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_NEHALEM_EX, nhmex_uncore_init),
1503-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_WESTMERE_EX, nhmex_uncore_init),
1504-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_IVYBRIDGE_X, ivbep_uncore_init),
1505-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL_X, hswep_uncore_init),
1506-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_X, bdx_uncore_init),
1507-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_D, bdx_uncore_init),
1508-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNL, knl_uncore_init),
1509-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNM, knl_uncore_init),
1510-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE, skl_uncore_init),
1511-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_L, skl_uncore_init),
1512-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_X, skx_uncore_init),
1513-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE_L, skl_uncore_init),
1514-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE, skl_uncore_init),
1515-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE_L, icl_uncore_init),
1516-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE_NNPI, icl_uncore_init),
1517-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE, icl_uncore_init),
1518-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_TIGERLAKE_L, tgl_l_uncore_init),
1519-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_TIGERLAKE, tgl_uncore_init),
1520-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_D, snr_uncore_init),
1486+
X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EP, &nhm_uncore_init),
1487+
X86_MATCH_INTEL_FAM6_MODEL(NEHALEM, &nhm_uncore_init),
1488+
X86_MATCH_INTEL_FAM6_MODEL(WESTMERE, &nhm_uncore_init),
1489+
X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EP, &nhm_uncore_init),
1490+
X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE, &snb_uncore_init),
1491+
X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE, &ivb_uncore_init),
1492+
X86_MATCH_INTEL_FAM6_MODEL(HASWELL, &hsw_uncore_init),
1493+
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_L, &hsw_uncore_init),
1494+
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_G, &hsw_uncore_init),
1495+
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL, &bdw_uncore_init),
1496+
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, &bdw_uncore_init),
1497+
X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X, &snbep_uncore_init),
1498+
X86_MATCH_INTEL_FAM6_MODEL(NEHALEM_EX, &nhmex_uncore_init),
1499+
X86_MATCH_INTEL_FAM6_MODEL(WESTMERE_EX, &nhmex_uncore_init),
1500+
X86_MATCH_INTEL_FAM6_MODEL(IVYBRIDGE_X, &ivbep_uncore_init),
1501+
X86_MATCH_INTEL_FAM6_MODEL(HASWELL_X, &hswep_uncore_init),
1502+
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, &bdx_uncore_init),
1503+
X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, &bdx_uncore_init),
1504+
X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL, &knl_uncore_init),
1505+
X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM, &knl_uncore_init),
1506+
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &skl_uncore_init),
1507+
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, &skl_uncore_init),
1508+
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, &skx_uncore_init),
1509+
X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, &skl_uncore_init),
1510+
X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, &skl_uncore_init),
1511+
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, &icl_uncore_init),
1512+
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_NNPI, &icl_uncore_init),
1513+
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, &icl_uncore_init),
1514+
X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, &tgl_l_uncore_init),
1515+
X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, &tgl_uncore_init),
1516+
X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &snr_uncore_init),
15211517
{},
15221518
};
1523-
15241519
MODULE_DEVICE_TABLE(x86cpu, intel_uncore_match);
15251520

15261521
static int __init intel_uncore_init(void)

0 commit comments

Comments
 (0)