Skip to content

Commit 22331f8

Browse files
torvaldstorvalds
committed
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cpu-feature updates from Ingo Molnar: - Rework the Intel model names symbols/macros, which were decades of ad-hoc extensions and added random noise. It's now a coherent, easy to follow nomenclature. - Add new Intel CPU model IDs: - "Tiger Lake" desktop and mobile models - "Elkhart Lake" model ID - and the "Lightning Mountain" variant of Airmont, plus support code - Add the new AVX512_VP2INTERSECT instruction to cpufeatures - Remove Intel MPX user-visible APIs and the self-tests, because the toolchain (gcc) is not supporting it going forward. This is the first, lowest-risk phase of MPX removal. - Remove X86_FEATURE_MFENCE_RDTSC - Various smaller cleanups and fixes * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (25 commits) x86/cpu: Update init data for new Airmont CPU model x86/cpu: Add new Airmont variant to Intel family x86/cpu: Add Elkhart Lake to Intel family x86/cpu: Add Tiger Lake to Intel family x86: Correct misc typos x86/intel: Add common OPTDIFFs x86/intel: Aggregate microserver naming x86/intel: Aggregate big core graphics naming x86/intel: Aggregate big core mobile naming x86/intel: Aggregate big core client naming x86/cpufeature: Explain the macro duplication x86/ftrace: Remove mcount() declaration x86/PCI: Remove superfluous returns from void functions x86/msr-index: Move AMD MSRs where they belong x86/cpu: Use constant definitions for CPU models lib: Remove redundant ftrace flag removal x86/crash: Remove unnecessary comparison x86/bitops: Use __builtin_constant_p() directly instead of IS_IMMEDIATE() x86: Remove X86_FEATURE_MFENCE_RDTSC x86/mpx: Remove MPX APIs ...
2 parents fc6fd13 + 0cc5359 commit 22331f8

Some content is hidden

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

54 files changed

+394
-2696
lines changed

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

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3987,31 +3987,31 @@ static __init void intel_clovertown_quirk(void)
39873987
}
39883988

39893989
static const struct x86_cpu_desc isolation_ucodes[] = {
3990-
INTEL_CPU_DESC(INTEL_FAM6_HASWELL_CORE, 3, 0x0000001f),
3991-
INTEL_CPU_DESC(INTEL_FAM6_HASWELL_ULT, 1, 0x0000001e),
3992-
INTEL_CPU_DESC(INTEL_FAM6_HASWELL_GT3E, 1, 0x00000015),
3990+
INTEL_CPU_DESC(INTEL_FAM6_HASWELL, 3, 0x0000001f),
3991+
INTEL_CPU_DESC(INTEL_FAM6_HASWELL_L, 1, 0x0000001e),
3992+
INTEL_CPU_DESC(INTEL_FAM6_HASWELL_G, 1, 0x00000015),
39933993
INTEL_CPU_DESC(INTEL_FAM6_HASWELL_X, 2, 0x00000037),
39943994
INTEL_CPU_DESC(INTEL_FAM6_HASWELL_X, 4, 0x0000000a),
3995-
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_CORE, 4, 0x00000023),
3996-
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_GT3E, 1, 0x00000014),
3997-
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_XEON_D, 2, 0x00000010),
3998-
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_XEON_D, 3, 0x07000009),
3999-
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_XEON_D, 4, 0x0f000009),
4000-
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_XEON_D, 5, 0x0e000002),
3995+
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL, 4, 0x00000023),
3996+
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_G, 1, 0x00000014),
3997+
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D, 2, 0x00000010),
3998+
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D, 3, 0x07000009),
3999+
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D, 4, 0x0f000009),
4000+
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D, 5, 0x0e000002),
40014001
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_X, 2, 0x0b000014),
40024002
INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 3, 0x00000021),
40034003
INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 4, 0x00000000),
4004-
INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_MOBILE, 3, 0x0000007c),
4005-
INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_DESKTOP, 3, 0x0000007c),
4006-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_DESKTOP, 9, 0x0000004e),
4007-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_MOBILE, 9, 0x0000004e),
4008-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_MOBILE, 10, 0x0000004e),
4009-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_MOBILE, 11, 0x0000004e),
4010-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_MOBILE, 12, 0x0000004e),
4011-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_DESKTOP, 10, 0x0000004e),
4012-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_DESKTOP, 11, 0x0000004e),
4013-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_DESKTOP, 12, 0x0000004e),
4014-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_DESKTOP, 13, 0x0000004e),
4004+
INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_L, 3, 0x0000007c),
4005+
INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE, 3, 0x0000007c),
4006+
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 9, 0x0000004e),
4007+
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_L, 9, 0x0000004e),
4008+
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_L, 10, 0x0000004e),
4009+
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_L, 11, 0x0000004e),
4010+
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_L, 12, 0x0000004e),
4011+
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 10, 0x0000004e),
4012+
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 11, 0x0000004e),
4013+
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 12, 0x0000004e),
4014+
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 13, 0x0000004e),
40154015
{}
40164016
};
40174017

@@ -4169,7 +4169,7 @@ static const struct x86_cpu_desc counter_freezing_ucodes[] = {
41694169
INTEL_CPU_DESC(INTEL_FAM6_ATOM_GOLDMONT, 2, 0x0000000e),
41704170
INTEL_CPU_DESC(INTEL_FAM6_ATOM_GOLDMONT, 9, 0x0000002e),
41714171
INTEL_CPU_DESC(INTEL_FAM6_ATOM_GOLDMONT, 10, 0x00000008),
4172-
INTEL_CPU_DESC(INTEL_FAM6_ATOM_GOLDMONT_X, 1, 0x00000028),
4172+
INTEL_CPU_DESC(INTEL_FAM6_ATOM_GOLDMONT_D, 1, 0x00000028),
41734173
INTEL_CPU_DESC(INTEL_FAM6_ATOM_GOLDMONT_PLUS, 1, 0x00000028),
41744174
INTEL_CPU_DESC(INTEL_FAM6_ATOM_GOLDMONT_PLUS, 8, 0x00000006),
41754175
{}
@@ -4667,7 +4667,7 @@ __init int intel_pmu_init(void)
46674667
break;
46684668

46694669
case INTEL_FAM6_ATOM_SILVERMONT:
4670-
case INTEL_FAM6_ATOM_SILVERMONT_X:
4670+
case INTEL_FAM6_ATOM_SILVERMONT_D:
46714671
case INTEL_FAM6_ATOM_SILVERMONT_MID:
46724672
case INTEL_FAM6_ATOM_AIRMONT:
46734673
case INTEL_FAM6_ATOM_AIRMONT_MID:
@@ -4689,7 +4689,7 @@ __init int intel_pmu_init(void)
46894689
break;
46904690

46914691
case INTEL_FAM6_ATOM_GOLDMONT:
4692-
case INTEL_FAM6_ATOM_GOLDMONT_X:
4692+
case INTEL_FAM6_ATOM_GOLDMONT_D:
46934693
x86_add_quirk(intel_counter_freezing_quirk);
46944694
memcpy(hw_cache_event_ids, glm_hw_cache_event_ids,
46954695
sizeof(hw_cache_event_ids));
@@ -4745,7 +4745,7 @@ __init int intel_pmu_init(void)
47454745
name = "goldmont_plus";
47464746
break;
47474747

4748-
case INTEL_FAM6_ATOM_TREMONT_X:
4748+
case INTEL_FAM6_ATOM_TREMONT_D:
47494749
x86_pmu.late_ack = true;
47504750
memcpy(hw_cache_event_ids, glp_hw_cache_event_ids,
47514751
sizeof(hw_cache_event_ids));
@@ -4881,10 +4881,10 @@ __init int intel_pmu_init(void)
48814881
break;
48824882

48834883

4884-
case INTEL_FAM6_HASWELL_CORE:
4884+
case INTEL_FAM6_HASWELL:
48854885
case INTEL_FAM6_HASWELL_X:
4886-
case INTEL_FAM6_HASWELL_ULT:
4887-
case INTEL_FAM6_HASWELL_GT3E:
4886+
case INTEL_FAM6_HASWELL_L:
4887+
case INTEL_FAM6_HASWELL_G:
48884888
x86_add_quirk(intel_ht_bug);
48894889
x86_add_quirk(intel_pebs_isolation_quirk);
48904890
x86_pmu.late_ack = true;
@@ -4914,9 +4914,9 @@ __init int intel_pmu_init(void)
49144914
name = "haswell";
49154915
break;
49164916

4917-
case INTEL_FAM6_BROADWELL_CORE:
4918-
case INTEL_FAM6_BROADWELL_XEON_D:
4919-
case INTEL_FAM6_BROADWELL_GT3E:
4917+
case INTEL_FAM6_BROADWELL:
4918+
case INTEL_FAM6_BROADWELL_D:
4919+
case INTEL_FAM6_BROADWELL_G:
49204920
case INTEL_FAM6_BROADWELL_X:
49214921
x86_add_quirk(intel_pebs_isolation_quirk);
49224922
x86_pmu.late_ack = true;
@@ -4979,10 +4979,10 @@ __init int intel_pmu_init(void)
49794979
case INTEL_FAM6_SKYLAKE_X:
49804980
pmem = true;
49814981
/* fall through */
4982-
case INTEL_FAM6_SKYLAKE_MOBILE:
4983-
case INTEL_FAM6_SKYLAKE_DESKTOP:
4984-
case INTEL_FAM6_KABYLAKE_MOBILE:
4985-
case INTEL_FAM6_KABYLAKE_DESKTOP:
4982+
case INTEL_FAM6_SKYLAKE_L:
4983+
case INTEL_FAM6_SKYLAKE:
4984+
case INTEL_FAM6_KABYLAKE_L:
4985+
case INTEL_FAM6_KABYLAKE:
49864986
x86_add_quirk(intel_pebs_isolation_quirk);
49874987
x86_pmu.late_ack = true;
49884988
memcpy(hw_cache_event_ids, skl_hw_cache_event_ids, sizeof(hw_cache_event_ids));
@@ -5026,11 +5026,11 @@ __init int intel_pmu_init(void)
50265026
break;
50275027

50285028
case INTEL_FAM6_ICELAKE_X:
5029-
case INTEL_FAM6_ICELAKE_XEON_D:
5029+
case INTEL_FAM6_ICELAKE_D:
50305030
pmem = true;
50315031
/* fall through */
5032-
case INTEL_FAM6_ICELAKE_MOBILE:
5033-
case INTEL_FAM6_ICELAKE_DESKTOP:
5032+
case INTEL_FAM6_ICELAKE_L:
5033+
case INTEL_FAM6_ICELAKE:
50345034
x86_pmu.late_ack = true;
50355035
memcpy(hw_cache_event_ids, skl_hw_cache_event_ids, sizeof(hw_cache_event_ids));
50365036
memcpy(hw_cache_extra_regs, skl_hw_cache_extra_regs, sizeof(hw_cache_extra_regs));

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -593,40 +593,40 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {
593593
X86_CSTATES_MODEL(INTEL_FAM6_IVYBRIDGE, snb_cstates),
594594
X86_CSTATES_MODEL(INTEL_FAM6_IVYBRIDGE_X, snb_cstates),
595595

596-
X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_CORE, snb_cstates),
597-
X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_X, snb_cstates),
598-
X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_GT3E, snb_cstates),
596+
X86_CSTATES_MODEL(INTEL_FAM6_HASWELL, snb_cstates),
597+
X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_X, snb_cstates),
598+
X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_G, snb_cstates),
599599

600-
X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_ULT, hswult_cstates),
600+
X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_L, hswult_cstates),
601601

602-
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_SILVERMONT, slm_cstates),
603-
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_SILVERMONT_X, slm_cstates),
604-
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_AIRMONT, slm_cstates),
602+
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_SILVERMONT, slm_cstates),
603+
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_SILVERMONT_D, slm_cstates),
604+
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_AIRMONT, slm_cstates),
605605

606-
X86_CSTATES_MODEL(INTEL_FAM6_BROADWELL_CORE, snb_cstates),
607-
X86_CSTATES_MODEL(INTEL_FAM6_BROADWELL_XEON_D, snb_cstates),
608-
X86_CSTATES_MODEL(INTEL_FAM6_BROADWELL_GT3E, snb_cstates),
609-
X86_CSTATES_MODEL(INTEL_FAM6_BROADWELL_X, snb_cstates),
606+
X86_CSTATES_MODEL(INTEL_FAM6_BROADWELL, snb_cstates),
607+
X86_CSTATES_MODEL(INTEL_FAM6_BROADWELL_D, snb_cstates),
608+
X86_CSTATES_MODEL(INTEL_FAM6_BROADWELL_G, snb_cstates),
609+
X86_CSTATES_MODEL(INTEL_FAM6_BROADWELL_X, snb_cstates),
610610

611-
X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_MOBILE, snb_cstates),
612-
X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_DESKTOP, snb_cstates),
611+
X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_L, snb_cstates),
612+
X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE, snb_cstates),
613613
X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_X, snb_cstates),
614614

615-
X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_MOBILE, hswult_cstates),
616-
X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_DESKTOP, hswult_cstates),
615+
X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_L, hswult_cstates),
616+
X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE, hswult_cstates),
617617

618-
X86_CSTATES_MODEL(INTEL_FAM6_CANNONLAKE_MOBILE, cnl_cstates),
618+
X86_CSTATES_MODEL(INTEL_FAM6_CANNONLAKE_L, cnl_cstates),
619619

620620
X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNL, knl_cstates),
621621
X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNM, knl_cstates),
622622

623-
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT, glm_cstates),
624-
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT_X, glm_cstates),
623+
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT, glm_cstates),
624+
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT_D, glm_cstates),
625625

626626
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT_PLUS, glm_cstates),
627627

628-
X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE_MOBILE, snb_cstates),
629-
X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE_DESKTOP, snb_cstates),
628+
X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE_L, snb_cstates),
629+
X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE, snb_cstates),
630630
{ },
631631
};
632632
MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ static int __init pt_pmu_hw_init(void)
204204

205205
/* model-specific quirks */
206206
switch (boot_cpu_data.x86_model) {
207-
case INTEL_FAM6_BROADWELL_CORE:
208-
case INTEL_FAM6_BROADWELL_XEON_D:
209-
case INTEL_FAM6_BROADWELL_GT3E:
207+
case INTEL_FAM6_BROADWELL:
208+
case INTEL_FAM6_BROADWELL_D:
209+
case INTEL_FAM6_BROADWELL_G:
210210
case INTEL_FAM6_BROADWELL_X:
211211
/* not setting BRANCH_EN will #GP, erratum BDM106 */
212212
pt_pmu.branch_en_always_on = true;

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -720,27 +720,27 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
720720
X86_RAPL_MODEL_MATCH(INTEL_FAM6_SANDYBRIDGE_X, model_snbep),
721721
X86_RAPL_MODEL_MATCH(INTEL_FAM6_IVYBRIDGE, model_snb),
722722
X86_RAPL_MODEL_MATCH(INTEL_FAM6_IVYBRIDGE_X, model_snbep),
723-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_HASWELL_CORE, model_hsw),
723+
X86_RAPL_MODEL_MATCH(INTEL_FAM6_HASWELL, model_hsw),
724724
X86_RAPL_MODEL_MATCH(INTEL_FAM6_HASWELL_X, model_hsx),
725-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_HASWELL_ULT, model_hsw),
726-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_HASWELL_GT3E, model_hsw),
727-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_CORE, model_hsw),
728-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_GT3E, model_hsw),
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),
729729
X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_X, model_hsx),
730-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_XEON_D, model_hsx),
730+
X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_D, model_hsx),
731731
X86_RAPL_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNL, model_knl),
732732
X86_RAPL_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNM, model_knl),
733-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_MOBILE, model_skl),
734-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_DESKTOP, model_skl),
733+
X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_L, model_skl),
734+
X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE, model_skl),
735735
X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_X, model_hsx),
736-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_KABYLAKE_MOBILE, model_skl),
737-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_KABYLAKE_DESKTOP, model_skl),
738-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_CANNONLAKE_MOBILE, model_skl),
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),
739739
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT, model_hsw),
740-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_X, model_hsw),
740+
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_D, model_hsw),
741741
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_PLUS, model_hsw),
742-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_MOBILE, model_skl),
743-
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_DESKTOP, model_skl),
742+
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_L, model_skl),
743+
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE, model_skl),
744744
{},
745745
};
746746

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1451,29 +1451,29 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {
14511451
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_WESTMERE_EP, nhm_uncore_init),
14521452
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SANDYBRIDGE, snb_uncore_init),
14531453
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_IVYBRIDGE, ivb_uncore_init),
1454-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL_CORE, hsw_uncore_init),
1455-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL_ULT, hsw_uncore_init),
1456-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL_GT3E, hsw_uncore_init),
1457-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_CORE, bdw_uncore_init),
1458-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_GT3E, bdw_uncore_init),
1454+
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL, hsw_uncore_init),
1455+
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL_L, hsw_uncore_init),
1456+
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL_G, hsw_uncore_init),
1457+
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL, bdw_uncore_init),
1458+
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_G, bdw_uncore_init),
14591459
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SANDYBRIDGE_X, snbep_uncore_init),
14601460
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_NEHALEM_EX, nhmex_uncore_init),
14611461
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_WESTMERE_EX, nhmex_uncore_init),
14621462
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_IVYBRIDGE_X, ivbep_uncore_init),
14631463
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL_X, hswep_uncore_init),
14641464
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_X, bdx_uncore_init),
1465-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_XEON_D, bdx_uncore_init),
1465+
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_D, bdx_uncore_init),
14661466
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNL, knl_uncore_init),
14671467
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNM, knl_uncore_init),
1468-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_DESKTOP,skl_uncore_init),
1469-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_MOBILE, skl_uncore_init),
1468+
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE, skl_uncore_init),
1469+
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_L, skl_uncore_init),
14701470
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_X, skx_uncore_init),
1471-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE_MOBILE, skl_uncore_init),
1472-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE_DESKTOP, skl_uncore_init),
1473-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE_MOBILE, icl_uncore_init),
1474-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE_NNPI, icl_uncore_init),
1475-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE_DESKTOP, icl_uncore_init),
1476-
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_X, snr_uncore_init),
1471+
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE_L, skl_uncore_init),
1472+
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE, skl_uncore_init),
1473+
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE_L, icl_uncore_init),
1474+
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE_NNPI, icl_uncore_init),
1475+
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE, icl_uncore_init),
1476+
X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_D, snr_uncore_init),
14771477
{},
14781478
};
14791479

‎arch/x86/events/msr.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,22 @@ static bool test_intel(int idx, void *data)
5959
case INTEL_FAM6_IVYBRIDGE:
6060
case INTEL_FAM6_IVYBRIDGE_X:
6161

62-
case INTEL_FAM6_HASWELL_CORE:
62+
case INTEL_FAM6_HASWELL:
6363
case INTEL_FAM6_HASWELL_X:
64-
case INTEL_FAM6_HASWELL_ULT:
65-
case INTEL_FAM6_HASWELL_GT3E:
64+
case INTEL_FAM6_HASWELL_L:
65+
case INTEL_FAM6_HASWELL_G:
6666

67-
case INTEL_FAM6_BROADWELL_CORE:
68-
case INTEL_FAM6_BROADWELL_XEON_D:
69-
case INTEL_FAM6_BROADWELL_GT3E:
67+
case INTEL_FAM6_BROADWELL:
68+
case INTEL_FAM6_BROADWELL_D:
69+
case INTEL_FAM6_BROADWELL_G:
7070
case INTEL_FAM6_BROADWELL_X:
7171

7272
case INTEL_FAM6_ATOM_SILVERMONT:
73-
case INTEL_FAM6_ATOM_SILVERMONT_X:
73+
case INTEL_FAM6_ATOM_SILVERMONT_D:
7474
case INTEL_FAM6_ATOM_AIRMONT:
7575

7676
case INTEL_FAM6_ATOM_GOLDMONT:
77-
case INTEL_FAM6_ATOM_GOLDMONT_X:
77+
case INTEL_FAM6_ATOM_GOLDMONT_D:
7878

7979
case INTEL_FAM6_ATOM_GOLDMONT_PLUS:
8080

@@ -84,12 +84,12 @@ static bool test_intel(int idx, void *data)
8484
return true;
8585
break;
8686

87-
case INTEL_FAM6_SKYLAKE_MOBILE:
88-
case INTEL_FAM6_SKYLAKE_DESKTOP:
87+
case INTEL_FAM6_SKYLAKE_L:
88+
case INTEL_FAM6_SKYLAKE:
8989
case INTEL_FAM6_SKYLAKE_X:
90-
case INTEL_FAM6_KABYLAKE_MOBILE:
91-
case INTEL_FAM6_KABYLAKE_DESKTOP:
92-
case INTEL_FAM6_ICELAKE_MOBILE:
90+
case INTEL_FAM6_KABYLAKE_L:
91+
case INTEL_FAM6_KABYLAKE:
92+
case INTEL_FAM6_ICELAKE_L:
9393
if (idx == PERF_MSR_SMI || idx == PERF_MSR_PPERF)
9494
return true;
9595
break;

‎arch/x86/include/asm/barrier.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ static inline unsigned long array_index_mask_nospec(unsigned long index,
4949
#define array_index_mask_nospec array_index_mask_nospec
5050

5151
/* Prevent speculative execution past this barrier. */
52-
#define barrier_nospec() alternative_2("", "mfence", X86_FEATURE_MFENCE_RDTSC, \
53-
"lfence", X86_FEATURE_LFENCE_RDTSC)
52+
#define barrier_nospec() alternative("", "lfence", X86_FEATURE_LFENCE_RDTSC)
5453

5554
#define dma_rmb() barrier()
5655
#define dma_wmb() barrier()

‎arch/x86/include/asm/bitops.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,13 @@
4545
* We do the locked ops that don't return the old value as
4646
* a mask operation on a byte.
4747
*/
48-
#define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
4948
#define CONST_MASK_ADDR(nr, addr) WBYTE_ADDR((void *)(addr) + ((nr)>>3))
5049
#define CONST_MASK(nr) (1 << ((nr) & 7))
5150

5251
static __always_inline void
5352
arch_set_bit(long nr, volatile unsigned long *addr)
5453
{
55-
if (IS_IMMEDIATE(nr)) {
54+
if (__builtin_constant_p(nr)) {
5655
asm volatile(LOCK_PREFIX "orb %1,%0"
5756
: CONST_MASK_ADDR(nr, addr)
5857
: "iq" ((u8)CONST_MASK(nr))
@@ -72,7 +71,7 @@ arch___set_bit(long nr, volatile unsigned long *addr)
7271
static __always_inline void
7372
arch_clear_bit(long nr, volatile unsigned long *addr)
7473
{
75-
if (IS_IMMEDIATE(nr)) {
74+
if (__builtin_constant_p(nr)) {
7675
asm volatile(LOCK_PREFIX "andb %1,%0"
7776
: CONST_MASK_ADDR(nr, addr)
7877
: "iq" ((u8)~CONST_MASK(nr)));
@@ -123,7 +122,7 @@ arch___change_bit(long nr, volatile unsigned long *addr)
123122
static __always_inline void
124123
arch_change_bit(long nr, volatile unsigned long *addr)
125124
{
126-
if (IS_IMMEDIATE(nr)) {
125+
if (__builtin_constant_p(nr)) {
127126
asm volatile(LOCK_PREFIX "xorb %1,%0"
128127
: CONST_MASK_ADDR(nr, addr)
129128
: "iq" ((u8)CONST_MASK(nr)));

0 commit comments

Comments
 (0)