Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux.git] / arch / x86 / events / intel / core.c

diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index 43c966d1208ebe1b5abeef7058e884d0d6e81c14..27ee47a7be6685db3c7b4d20bc0b5ef7ab7a0006 100644 (file)
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -3987,31 +3987,31 @@ static __init void intel_clovertown_quirk(void)
 }
 
 static const struct x86_cpu_desc isolation_ucodes[] = {
-       INTEL_CPU_DESC(INTEL_FAM6_HASWELL_CORE,          3, 0x0000001f),
-       INTEL_CPU_DESC(INTEL_FAM6_HASWELL_ULT,           1, 0x0000001e),
-       INTEL_CPU_DESC(INTEL_FAM6_HASWELL_GT3E,          1, 0x00000015),
+       INTEL_CPU_DESC(INTEL_FAM6_HASWELL,               3, 0x0000001f),
+       INTEL_CPU_DESC(INTEL_FAM6_HASWELL_L,             1, 0x0000001e),
+       INTEL_CPU_DESC(INTEL_FAM6_HASWELL_G,             1, 0x00000015),
        INTEL_CPU_DESC(INTEL_FAM6_HASWELL_X,             2, 0x00000037),
        INTEL_CPU_DESC(INTEL_FAM6_HASWELL_X,             4, 0x0000000a),
-       INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_CORE,        4, 0x00000023),
-       INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_GT3E,        1, 0x00000014),
-       INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_XEON_D,      2, 0x00000010),
-       INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_XEON_D,      3, 0x07000009),
-       INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_XEON_D,      4, 0x0f000009),
-       INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_XEON_D,      5, 0x0e000002),
+       INTEL_CPU_DESC(INTEL_FAM6_BROADWELL,             4, 0x00000023),
+       INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_G,           1, 0x00000014),
+       INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D,           2, 0x00000010),
+       INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D,           3, 0x07000009),
+       INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D,           4, 0x0f000009),
+       INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D,           5, 0x0e000002),
        INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_X,           2, 0x0b000014),
        INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X,             3, 0x00000021),
        INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X,             4, 0x00000000),
-       INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_MOBILE,        3, 0x0000007c),
-       INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_DESKTOP,       3, 0x0000007c),
-       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_DESKTOP,      9, 0x0000004e),
-       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_MOBILE,       9, 0x0000004e),
-       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_MOBILE,      10, 0x0000004e),
-       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_MOBILE,      11, 0x0000004e),
-       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_MOBILE,      12, 0x0000004e),
-       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_DESKTOP,     10, 0x0000004e),
-       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_DESKTOP,     11, 0x0000004e),
-       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_DESKTOP,     12, 0x0000004e),
-       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_DESKTOP,     13, 0x0000004e),
+       INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_L,             3, 0x0000007c),
+       INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE,               3, 0x0000007c),
+       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE,              9, 0x0000004e),
+       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_L,            9, 0x0000004e),
+       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_L,           10, 0x0000004e),
+       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_L,           11, 0x0000004e),
+       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_L,           12, 0x0000004e),
+       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE,             10, 0x0000004e),
+       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE,             11, 0x0000004e),
+       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE,             12, 0x0000004e),
+       INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE,             13, 0x0000004e),
        {}
 };
 
@@ -4169,7 +4169,7 @@ static const struct x86_cpu_desc counter_freezing_ucodes[] = {
        INTEL_CPU_DESC(INTEL_FAM6_ATOM_GOLDMONT,         2, 0x0000000e),
        INTEL_CPU_DESC(INTEL_FAM6_ATOM_GOLDMONT,         9, 0x0000002e),
        INTEL_CPU_DESC(INTEL_FAM6_ATOM_GOLDMONT,        10, 0x00000008),
-       INTEL_CPU_DESC(INTEL_FAM6_ATOM_GOLDMONT_X,       1, 0x00000028),
+       INTEL_CPU_DESC(INTEL_FAM6_ATOM_GOLDMONT_D,       1, 0x00000028),
        INTEL_CPU_DESC(INTEL_FAM6_ATOM_GOLDMONT_PLUS,    1, 0x00000028),
        INTEL_CPU_DESC(INTEL_FAM6_ATOM_GOLDMONT_PLUS,    8, 0x00000006),
        {}
@@ -4667,7 +4667,7 @@ __init int intel_pmu_init(void)
                break;
 
        case INTEL_FAM6_ATOM_SILVERMONT:
-       case INTEL_FAM6_ATOM_SILVERMONT_X:
+       case INTEL_FAM6_ATOM_SILVERMONT_D:
        case INTEL_FAM6_ATOM_SILVERMONT_MID:
        case INTEL_FAM6_ATOM_AIRMONT:
        case INTEL_FAM6_ATOM_AIRMONT_MID:
@@ -4689,7 +4689,7 @@ __init int intel_pmu_init(void)
                break;
 
        case INTEL_FAM6_ATOM_GOLDMONT:
-       case INTEL_FAM6_ATOM_GOLDMONT_X:
+       case INTEL_FAM6_ATOM_GOLDMONT_D:
                x86_add_quirk(intel_counter_freezing_quirk);
                memcpy(hw_cache_event_ids, glm_hw_cache_event_ids,
                       sizeof(hw_cache_event_ids));
@@ -4745,7 +4745,7 @@ __init int intel_pmu_init(void)
                name = "goldmont_plus";
                break;
 
-       case INTEL_FAM6_ATOM_TREMONT_X:
+       case INTEL_FAM6_ATOM_TREMONT_D:
                x86_pmu.late_ack = true;
                memcpy(hw_cache_event_ids, glp_hw_cache_event_ids,
                       sizeof(hw_cache_event_ids));
@@ -4881,10 +4881,10 @@ __init int intel_pmu_init(void)
                break;
 
 
-       case INTEL_FAM6_HASWELL_CORE:
+       case INTEL_FAM6_HASWELL:
        case INTEL_FAM6_HASWELL_X:
-       case INTEL_FAM6_HASWELL_ULT:
-       case INTEL_FAM6_HASWELL_GT3E:
+       case INTEL_FAM6_HASWELL_L:
+       case INTEL_FAM6_HASWELL_G:
                x86_add_quirk(intel_ht_bug);
                x86_add_quirk(intel_pebs_isolation_quirk);
                x86_pmu.late_ack = true;
@@ -4914,9 +4914,9 @@ __init int intel_pmu_init(void)
                name = "haswell";
                break;
 
-       case INTEL_FAM6_BROADWELL_CORE:
-       case INTEL_FAM6_BROADWELL_XEON_D:
-       case INTEL_FAM6_BROADWELL_GT3E:
+       case INTEL_FAM6_BROADWELL:
+       case INTEL_FAM6_BROADWELL_D:
+       case INTEL_FAM6_BROADWELL_G:
        case INTEL_FAM6_BROADWELL_X:
                x86_add_quirk(intel_pebs_isolation_quirk);
                x86_pmu.late_ack = true;
@@ -4979,10 +4979,10 @@ __init int intel_pmu_init(void)
        case INTEL_FAM6_SKYLAKE_X:
                pmem = true;
                /* fall through */
-       case INTEL_FAM6_SKYLAKE_MOBILE:
-       case INTEL_FAM6_SKYLAKE_DESKTOP:
-       case INTEL_FAM6_KABYLAKE_MOBILE:
-       case INTEL_FAM6_KABYLAKE_DESKTOP:
+       case INTEL_FAM6_SKYLAKE_L:
+       case INTEL_FAM6_SKYLAKE:
+       case INTEL_FAM6_KABYLAKE_L:
+       case INTEL_FAM6_KABYLAKE:
                x86_add_quirk(intel_pebs_isolation_quirk);
                x86_pmu.late_ack = true;
                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)
                break;
 
        case INTEL_FAM6_ICELAKE_X:
-       case INTEL_FAM6_ICELAKE_XEON_D:
+       case INTEL_FAM6_ICELAKE_D:
                pmem = true;
                /* fall through */
-       case INTEL_FAM6_ICELAKE_MOBILE:
-       case INTEL_FAM6_ICELAKE_DESKTOP:
+       case INTEL_FAM6_ICELAKE_L:
+       case INTEL_FAM6_ICELAKE:
                x86_pmu.late_ack = true;
                memcpy(hw_cache_event_ids, skl_hw_cache_event_ids, sizeof(hw_cache_event_ids));
                memcpy(hw_cache_extra_regs, skl_hw_cache_extra_regs, sizeof(hw_cache_extra_regs));