x86/intel: Aggregate big core mobile naming

Currently big core mobile chips have either:

 - _L
 - _ULT
 - _MOBILE

Make it uniformly: _L.

for i in `git grep -l "\(INTEL_FAM6_\|VULNWL_INTEL\|INTEL_CPU_FAM6\).*_\(MOBILE\|ULT\)"`
do
	sed -i -e 's/\(\(INTEL_FAM6_\|VULNWL_INTEL\|INTEL_CPU_FAM6\).*\)_\(MOBILE\|ULT\)/\1_L/g' ${i}
done

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Tony Luck <tony.luck@intel.com>
Cc: x86@kernel.org
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20190827195122.568978530@infradead.org

16 files changed, 86 insertions, 86 deletions

diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index 76bff3a33725..22ef9ccaf45c 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -3965,7 +3965,7 @@ static __init void intel_clovertown_quirk(void)
 
 static const struct x86_cpu_desc isolation_ucodes[] = {
         INTEL_CPU_DESC(INTEL_FAM6_HASWELL,               3, 0x0000001f),
-        INTEL_CPU_DESC(INTEL_FAM6_HASWELL_ULT,           1, 0x0000001e),
+        INTEL_CPU_DESC(INTEL_FAM6_HASWELL_L,             1, 0x0000001e),
         INTEL_CPU_DESC(INTEL_FAM6_HASWELL_GT3E,          1, 0x00000015),
         INTEL_CPU_DESC(INTEL_FAM6_HASWELL_X,             2, 0x00000037),
         INTEL_CPU_DESC(INTEL_FAM6_HASWELL_X,             4, 0x0000000a),
@@ -3978,13 +3978,13 @@ static const struct x86_cpu_desc isolation_ucodes[] = {
         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_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_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_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),
@@ -4859,7 +4859,7 @@ __init int intel_pmu_init(void)
 
         case INTEL_FAM6_HASWELL:
         case INTEL_FAM6_HASWELL_X:
-        case INTEL_FAM6_HASWELL_ULT:
+        case INTEL_FAM6_HASWELL_L:
         case INTEL_FAM6_HASWELL_GT3E:
                 x86_add_quirk(intel_ht_bug);
                 x86_add_quirk(intel_pebs_isolation_quirk);
@@ -4955,9 +4955,9 @@ __init int intel_pmu_init(void)
         case INTEL_FAM6_SKYLAKE_X:
                 pmem = true;
                 /* fall through */
-        case INTEL_FAM6_SKYLAKE_MOBILE:
+        case INTEL_FAM6_SKYLAKE_L:
         case INTEL_FAM6_SKYLAKE:
-        case INTEL_FAM6_KABYLAKE_MOBILE:
+        case INTEL_FAM6_KABYLAKE_L:
         case INTEL_FAM6_KABYLAKE:
                 x86_add_quirk(intel_pebs_isolation_quirk);
                 x86_pmu.late_ack = true;
@@ -5005,7 +5005,7 @@ __init int intel_pmu_init(void)
         case INTEL_FAM6_ICELAKE_XEON_D:
                 pmem = true;
                 /* fall through */
-        case INTEL_FAM6_ICELAKE_MOBILE:
+        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));
diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
index 3854400ad8ff..9b014e813626 100644
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -597,7 +597,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {
         X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_X,    snb_cstates),
         X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_GT3E, snb_cstates),
 
-        X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_ULT, hswult_cstates),
+        X86_CSTATES_MODEL(INTEL_FAM6_HASWELL_L, hswult_cstates),
 
         X86_CSTATES_MODEL(INTEL_FAM6_ATOM_SILVERMONT,   slm_cstates),
         X86_CSTATES_MODEL(INTEL_FAM6_ATOM_SILVERMONT_X, slm_cstates),
@@ -608,14 +608,14 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {
         X86_CSTATES_MODEL(INTEL_FAM6_BROADWELL_GT3E,   snb_cstates),
         X86_CSTATES_MODEL(INTEL_FAM6_BROADWELL_X,      snb_cstates),
 
-        X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_MOBILE, snb_cstates),
-        X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE,        snb_cstates),
-        X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_X,      snb_cstates),
+        X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_L, snb_cstates),
+        X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE,   snb_cstates),
+        X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_X, snb_cstates),
 
-        X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_MOBILE, hswult_cstates),
-        X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE,        hswult_cstates),
+        X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_L, hswult_cstates),
+        X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE,   hswult_cstates),
 
-        X86_CSTATES_MODEL(INTEL_FAM6_CANNONLAKE_MOBILE, cnl_cstates),
+        X86_CSTATES_MODEL(INTEL_FAM6_CANNONLAKE_L, cnl_cstates),
 
         X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNL, knl_cstates),
         X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNM, knl_cstates),
@@ -625,8 +625,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {
 
         X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT_PLUS, glm_cstates),
 
-        X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE_MOBILE, snb_cstates),
-        X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE,        snb_cstates),
+        X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE_L, snb_cstates),
+        X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE,   snb_cstates),
         { },
 };
 MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);
diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index c1278e2764f4..70dcfe9312b0 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -722,7 +722,7 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
         X86_RAPL_MODEL_MATCH(INTEL_FAM6_IVYBRIDGE_X,            model_snbep),
         X86_RAPL_MODEL_MATCH(INTEL_FAM6_HASWELL,                model_hsw),
         X86_RAPL_MODEL_MATCH(INTEL_FAM6_HASWELL_X,              model_hsx),
-        X86_RAPL_MODEL_MATCH(INTEL_FAM6_HASWELL_ULT,            model_hsw),
+        X86_RAPL_MODEL_MATCH(INTEL_FAM6_HASWELL_L,              model_hsw),
         X86_RAPL_MODEL_MATCH(INTEL_FAM6_HASWELL_GT3E,           model_hsw),
         X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL,              model_hsw),
         X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_GT3E,         model_hsw),
@@ -730,16 +730,16 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
         X86_RAPL_MODEL_MATCH(INTEL_FAM6_BROADWELL_XEON_D,       model_hsx),
         X86_RAPL_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNL,           model_knl),
         X86_RAPL_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNM,           model_knl),
-        X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_MOBILE,         model_skl),
+        X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_L,              model_skl),
         X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE,                model_skl),
         X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_X,              model_hsx),
-        X86_RAPL_MODEL_MATCH(INTEL_FAM6_KABYLAKE_MOBILE,        model_skl),
+        X86_RAPL_MODEL_MATCH(INTEL_FAM6_KABYLAKE_L,             model_skl),
         X86_RAPL_MODEL_MATCH(INTEL_FAM6_KABYLAKE,               model_skl),
-        X86_RAPL_MODEL_MATCH(INTEL_FAM6_CANNONLAKE_MOBILE,      model_skl),
+        X86_RAPL_MODEL_MATCH(INTEL_FAM6_CANNONLAKE_L,           model_skl),
         X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT,          model_hsw),
         X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_X,        model_hsw),
         X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_PLUS,     model_hsw),
-        X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_MOBILE,         model_skl),
+        X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_L,              model_skl),
         X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE,                model_skl),
         {},
 };
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
index d5e091586242..8428e28c9625 100644
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -1452,7 +1452,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {
         X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SANDYBRIDGE,    snb_uncore_init),
         X86_UNCORE_MODEL_MATCH(INTEL_FAM6_IVYBRIDGE,      ivb_uncore_init),
         X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL,        hsw_uncore_init),
-        X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL_ULT,    hsw_uncore_init),
+        X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL_L,      hsw_uncore_init),
         X86_UNCORE_MODEL_MATCH(INTEL_FAM6_HASWELL_GT3E,   hsw_uncore_init),
         X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL,      bdw_uncore_init),
         X86_UNCORE_MODEL_MATCH(INTEL_FAM6_BROADWELL_GT3E, bdw_uncore_init),
@@ -1466,11 +1466,11 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {
         X86_UNCORE_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNL,   knl_uncore_init),
         X86_UNCORE_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNM,   knl_uncore_init),
         X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE,        skl_uncore_init),
-        X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_MOBILE, skl_uncore_init),
+        X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_L,      skl_uncore_init),
         X86_UNCORE_MODEL_MATCH(INTEL_FAM6_SKYLAKE_X,      skx_uncore_init),
-        X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE_MOBILE, skl_uncore_init),
+        X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE_L,     skl_uncore_init),
         X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE,       skl_uncore_init),
-        X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE_MOBILE, icl_uncore_init),
+        X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE_L,      icl_uncore_init),
         X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE_NNPI,   icl_uncore_init),
         X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE,        icl_uncore_init),
         X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_X, snr_uncore_init),
diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c
index 08d320a39dff..12265c14e60d 100644
--- a/arch/x86/events/msr.c
+++ b/arch/x86/events/msr.c
@@ -61,7 +61,7 @@ static bool test_intel(int idx, void *data)
 
         case INTEL_FAM6_HASWELL:
         case INTEL_FAM6_HASWELL_X:
-        case INTEL_FAM6_HASWELL_ULT:
+        case INTEL_FAM6_HASWELL_L:
         case INTEL_FAM6_HASWELL_GT3E:
 
         case INTEL_FAM6_BROADWELL:
@@ -84,12 +84,12 @@ static bool test_intel(int idx, void *data)
                         return true;
                 break;
 
-        case INTEL_FAM6_SKYLAKE_MOBILE:
+        case INTEL_FAM6_SKYLAKE_L:
         case INTEL_FAM6_SKYLAKE:
         case INTEL_FAM6_SKYLAKE_X:
-        case INTEL_FAM6_KABYLAKE_MOBILE:
+        case INTEL_FAM6_KABYLAKE_L:
         case INTEL_FAM6_KABYLAKE:
-        case INTEL_FAM6_ICELAKE_MOBILE:
+        case INTEL_FAM6_ICELAKE_L:
                 if (idx == PERF_MSR_SMI || idx == PERF_MSR_PPERF)
                         return true;
                 break;
diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
index 800dd17e61c4..25b71d4e9224 100644
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -51,7 +51,7 @@
 
 #define INTEL_FAM6_HASWELL              0x3C
 #define INTEL_FAM6_HASWELL_X            0x3F
-#define INTEL_FAM6_HASWELL_ULT          0x45
+#define INTEL_FAM6_HASWELL_L            0x45
 #define INTEL_FAM6_HASWELL_GT3E         0x46
 
 #define INTEL_FAM6_BROADWELL            0x3D
@@ -59,18 +59,18 @@
 #define INTEL_FAM6_BROADWELL_X          0x4F
 #define INTEL_FAM6_BROADWELL_XEON_D     0x56
 
-#define INTEL_FAM6_SKYLAKE_MOBILE       0x4E
+#define INTEL_FAM6_SKYLAKE_L            0x4E
 #define INTEL_FAM6_SKYLAKE              0x5E
 #define INTEL_FAM6_SKYLAKE_X            0x55
-#define INTEL_FAM6_KABYLAKE_MOBILE      0x8E
+#define INTEL_FAM6_KABYLAKE_L           0x8E
 #define INTEL_FAM6_KABYLAKE             0x9E
 
-#define INTEL_FAM6_CANNONLAKE_MOBILE    0x66
+#define INTEL_FAM6_CANNONLAKE_L         0x66
 
 #define INTEL_FAM6_ICELAKE_X            0x6A
 #define INTEL_FAM6_ICELAKE_XEON_D       0x6C
 #define INTEL_FAM6_ICELAKE              0x7D
-#define INTEL_FAM6_ICELAKE_MOBILE       0x7E
+#define INTEL_FAM6_ICELAKE_L            0x7E
 #define INTEL_FAM6_ICELAKE_NNPI         0x9D
 
 /* "Small Core" Processors (Atom) */
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 0527465e1c98..adf001d30b47 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -594,16 +594,16 @@ static const struct x86_cpu_id deadline_match[] = {
         DEADLINE_MODEL_MATCH_FUNC( INTEL_FAM6_SKYLAKE_X,        skx_deadline_rev),
 
         DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_HASWELL,          0x22),
-        DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_HASWELL_ULT,      0x20),
+        DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_HASWELL_L,        0x20),
         DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_HASWELL_GT3E,     0x17),
 
         DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_BROADWELL,        0x25),
         DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_BROADWELL_GT3E,   0x17),
 
-        DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_SKYLAKE_MOBILE,   0xb2),
+        DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_SKYLAKE_L,        0xb2),
         DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_SKYLAKE,          0xb2),
 
-        DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_KABYLAKE_MOBILE,  0x52),
+        DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_KABYLAKE_L,       0x52),
         DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_KABYLAKE,         0x52),
 
         {},
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 6c611abd6cdd..f435780fe45e 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -1185,13 +1185,13 @@ static void override_cache_bits(struct cpuinfo_x86 *c)
         case INTEL_FAM6_SANDYBRIDGE:
         case INTEL_FAM6_IVYBRIDGE:
         case INTEL_FAM6_HASWELL:
-        case INTEL_FAM6_HASWELL_ULT:
+        case INTEL_FAM6_HASWELL_L:
         case INTEL_FAM6_HASWELL_GT3E:
         case INTEL_FAM6_BROADWELL:
         case INTEL_FAM6_BROADWELL_GT3E:
-        case INTEL_FAM6_SKYLAKE_MOBILE:
+        case INTEL_FAM6_SKYLAKE_L:
         case INTEL_FAM6_SKYLAKE:
-        case INTEL_FAM6_KABYLAKE_MOBILE:
+        case INTEL_FAM6_KABYLAKE_L:
         case INTEL_FAM6_KABYLAKE:
                 if (c->x86_cache_bits < 44)
                         c->x86_cache_bits = 44;
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index ca62563c1bb3..bafa2735f541 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -145,8 +145,8 @@ static const struct sku_microcode spectre_bad_microcodes[] = {
         { INTEL_FAM6_KABYLAKE,          0x0B,   0x80 },
         { INTEL_FAM6_KABYLAKE,          0x0A,   0x80 },
         { INTEL_FAM6_KABYLAKE,          0x09,   0x80 },
-        { INTEL_FAM6_KABYLAKE_MOBILE,   0x0A,   0x80 },
-        { INTEL_FAM6_KABYLAKE_MOBILE,   0x09,   0x80 },
+        { INTEL_FAM6_KABYLAKE_L,        0x0A,   0x80 },
+        { INTEL_FAM6_KABYLAKE_L,        0x09,   0x80 },
         { INTEL_FAM6_SKYLAKE_X,         0x03,   0x0100013e },
         { INTEL_FAM6_SKYLAKE_X,         0x04,   0x0200003c },
         { INTEL_FAM6_BROADWELL,         0x04,   0x28 },
@@ -154,7 +154,7 @@ static const struct sku_microcode spectre_bad_microcodes[] = {
         { INTEL_FAM6_BROADWELL_XEON_D,  0x02,   0x14 },
         { INTEL_FAM6_BROADWELL_XEON_D,  0x03,   0x07000011 },
         { INTEL_FAM6_BROADWELL_X,       0x01,   0x0b000025 },
-        { INTEL_FAM6_HASWELL_ULT,       0x01,   0x21 },
+        { INTEL_FAM6_HASWELL_L,         0x01,   0x21 },
         { INTEL_FAM6_HASWELL_GT3E,      0x01,   0x18 },
         { INTEL_FAM6_HASWELL,           0x03,   0x23 },
         { INTEL_FAM6_HASWELL_X,         0x02,   0x3b },
diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c
index ba277cd5c7fa..697a6b12d6b9 100644
--- a/drivers/acpi/x86/utils.c
+++ b/drivers/acpi/x86/utils.c
@@ -69,11 +69,11 @@ static const struct always_present_id always_present_ids[] = {
          * after _SB.PCI0.GFX0.LCD.LCD1._ON gets called has passed
          * *and* _STA has been called at least 3 times since.
          */
-        ENTRY("SYNA7500", "1", ICPU(INTEL_FAM6_HASWELL_ULT), {
+        ENTRY("SYNA7500", "1", ICPU(INTEL_FAM6_HASWELL_L), {
                 DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
                 DMI_MATCH(DMI_PRODUCT_NAME, "Venue 11 Pro 7130"),
               }),
-        ENTRY("SYNA7500", "1", ICPU(INTEL_FAM6_HASWELL_ULT), {
+        ENTRY("SYNA7500", "1", ICPU(INTEL_FAM6_HASWELL_L), {
                 DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
                 DMI_MATCH(DMI_PRODUCT_NAME, "Venue 11 Pro 7139"),
               }),
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 17cb9af25328..6e393aabdc13 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -1875,11 +1875,11 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
         ICPU(INTEL_FAM6_BROADWELL,              core_funcs),
         ICPU(INTEL_FAM6_IVYBRIDGE_X,            core_funcs),
         ICPU(INTEL_FAM6_HASWELL_X,              core_funcs),
-        ICPU(INTEL_FAM6_HASWELL_ULT,            core_funcs),
+        ICPU(INTEL_FAM6_HASWELL_L,              core_funcs),
         ICPU(INTEL_FAM6_HASWELL_GT3E,           core_funcs),
         ICPU(INTEL_FAM6_BROADWELL_GT3E,         core_funcs),
         ICPU(INTEL_FAM6_ATOM_AIRMONT,           airmont_funcs),
-        ICPU(INTEL_FAM6_SKYLAKE_MOBILE,         core_funcs),
+        ICPU(INTEL_FAM6_SKYLAKE_L,              core_funcs),
         ICPU(INTEL_FAM6_BROADWELL_X,            core_funcs),
         ICPU(INTEL_FAM6_SKYLAKE,                core_funcs),
         ICPU(INTEL_FAM6_BROADWELL_XEON_D,       core_funcs),
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index f45898965fe1..d0e4f16b8f06 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -1074,16 +1074,16 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = {
         INTEL_CPU_FAM6(IVYBRIDGE_X,             idle_cpu_ivt),
         INTEL_CPU_FAM6(HASWELL,                 idle_cpu_hsw),
         INTEL_CPU_FAM6(HASWELL_X,               idle_cpu_hsw),
-        INTEL_CPU_FAM6(HASWELL_ULT,             idle_cpu_hsw),
+        INTEL_CPU_FAM6(HASWELL_L,               idle_cpu_hsw),
         INTEL_CPU_FAM6(HASWELL_GT3E,            idle_cpu_hsw),
         INTEL_CPU_FAM6(ATOM_SILVERMONT_X,       idle_cpu_avn),
         INTEL_CPU_FAM6(BROADWELL,               idle_cpu_bdw),
         INTEL_CPU_FAM6(BROADWELL_GT3E,          idle_cpu_bdw),
         INTEL_CPU_FAM6(BROADWELL_X,             idle_cpu_bdw),
         INTEL_CPU_FAM6(BROADWELL_XEON_D,        idle_cpu_bdw),
-        INTEL_CPU_FAM6(SKYLAKE_MOBILE,          idle_cpu_skl),
+        INTEL_CPU_FAM6(SKYLAKE_L,               idle_cpu_skl),
         INTEL_CPU_FAM6(SKYLAKE,                 idle_cpu_skl),
-        INTEL_CPU_FAM6(KABYLAKE_MOBILE,         idle_cpu_skl),
+        INTEL_CPU_FAM6(KABYLAKE_L,              idle_cpu_skl),
         INTEL_CPU_FAM6(KABYLAKE,                idle_cpu_skl),
         INTEL_CPU_FAM6(SKYLAKE_X,               idle_cpu_skx),
         INTEL_CPU_FAM6(XEON_PHI_KNL,            idle_cpu_knl),
diff --git a/drivers/platform/x86/intel_pmc_core.c b/drivers/platform/x86/intel_pmc_core.c
index 3a82df45bced..fd1bfd5d2689 100644
--- a/drivers/platform/x86/intel_pmc_core.c
+++ b/drivers/platform/x86/intel_pmc_core.c
@@ -806,12 +806,12 @@ static inline void pmc_core_dbgfs_unregister(struct pmc_dev *pmcdev)
 #endif /* CONFIG_DEBUG_FS */
 
 static const struct x86_cpu_id intel_pmc_core_ids[] = {
-        INTEL_CPU_FAM6(SKYLAKE_MOBILE, spt_reg_map),
+        INTEL_CPU_FAM6(SKYLAKE_L, spt_reg_map),
         INTEL_CPU_FAM6(SKYLAKE, spt_reg_map),
-        INTEL_CPU_FAM6(KABYLAKE_MOBILE, spt_reg_map),
+        INTEL_CPU_FAM6(KABYLAKE_L, spt_reg_map),
         INTEL_CPU_FAM6(KABYLAKE, spt_reg_map),
-        INTEL_CPU_FAM6(CANNONLAKE_MOBILE, cnp_reg_map),
-        INTEL_CPU_FAM6(ICELAKE_MOBILE, icl_reg_map),
+        INTEL_CPU_FAM6(CANNONLAKE_L, cnp_reg_map),
+        INTEL_CPU_FAM6(ICELAKE_L, icl_reg_map),
         INTEL_CPU_FAM6(ICELAKE_NNPI, icl_reg_map),
         {}
 };
diff --git a/drivers/platform/x86/intel_pmc_core_pltdrv.c b/drivers/platform/x86/intel_pmc_core_pltdrv.c
index 52f5bcb88011..5977e0d66624 100644
--- a/drivers/platform/x86/intel_pmc_core_pltdrv.c
+++ b/drivers/platform/x86/intel_pmc_core_pltdrv.c
@@ -30,12 +30,12 @@ static struct platform_device pmc_core_device = {
  * other list may grow, but this list should not.
  */
 static const struct x86_cpu_id intel_pmc_core_platform_ids[] = {
-        INTEL_CPU_FAM6(SKYLAKE_MOBILE, pmc_core_device),
+        INTEL_CPU_FAM6(SKYLAKE_L, pmc_core_device),
         INTEL_CPU_FAM6(SKYLAKE, pmc_core_device),
-        INTEL_CPU_FAM6(KABYLAKE_MOBILE, pmc_core_device),
+        INTEL_CPU_FAM6(KABYLAKE_L, pmc_core_device),
         INTEL_CPU_FAM6(KABYLAKE, pmc_core_device),
-        INTEL_CPU_FAM6(CANNONLAKE_MOBILE, pmc_core_device),
-        INTEL_CPU_FAM6(ICELAKE_MOBILE, pmc_core_device),
+        INTEL_CPU_FAM6(CANNONLAKE_L, pmc_core_device),
+        INTEL_CPU_FAM6(ICELAKE_L, pmc_core_device),
         {}
 };
 MODULE_DEVICE_TABLE(x86cpu, intel_pmc_core_platform_ids);
diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
index 7c9eb78d3471..ac52a6ec4931 100644
--- a/drivers/powercap/intel_rapl_common.c
+++ b/drivers/powercap/intel_rapl_common.c
@@ -958,7 +958,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
         INTEL_CPU_FAM6(IVYBRIDGE_X, rapl_defaults_core),
 
         INTEL_CPU_FAM6(HASWELL, rapl_defaults_core),
-        INTEL_CPU_FAM6(HASWELL_ULT, rapl_defaults_core),
+        INTEL_CPU_FAM6(HASWELL_L, rapl_defaults_core),
         INTEL_CPU_FAM6(HASWELL_GT3E, rapl_defaults_core),
         INTEL_CPU_FAM6(HASWELL_X, rapl_defaults_hsw_server),
 
@@ -968,12 +968,12 @@ static const struct x86_cpu_id rapl_ids[] __initconst = {
         INTEL_CPU_FAM6(BROADWELL_X, rapl_defaults_hsw_server),
 
         INTEL_CPU_FAM6(SKYLAKE, rapl_defaults_core),
-        INTEL_CPU_FAM6(SKYLAKE_MOBILE, rapl_defaults_core),
+        INTEL_CPU_FAM6(SKYLAKE_L, rapl_defaults_core),
         INTEL_CPU_FAM6(SKYLAKE_X, rapl_defaults_hsw_server),
-        INTEL_CPU_FAM6(KABYLAKE_MOBILE, rapl_defaults_core),
+        INTEL_CPU_FAM6(KABYLAKE_L, rapl_defaults_core),
         INTEL_CPU_FAM6(KABYLAKE, rapl_defaults_core),
-        INTEL_CPU_FAM6(CANNONLAKE_MOBILE, rapl_defaults_core),
-        INTEL_CPU_FAM6(ICELAKE_MOBILE, rapl_defaults_core),
+        INTEL_CPU_FAM6(CANNONLAKE_L, rapl_defaults_core),
+        INTEL_CPU_FAM6(ICELAKE_L, rapl_defaults_core),
         INTEL_CPU_FAM6(ICELAKE, rapl_defaults_core),
         INTEL_CPU_FAM6(ICELAKE_NNPI, rapl_defaults_core),
         INTEL_CPU_FAM6(ICELAKE_X, rapl_defaults_hsw_server),
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 8083a354ae7f..bb1bef6bf0b9 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -3213,8 +3213,8 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)
         case INTEL_FAM6_BROADWELL:      /* BDW */
         case INTEL_FAM6_BROADWELL_GT3E: /* BDW */
         case INTEL_FAM6_BROADWELL_X:    /* BDX */
-        case INTEL_FAM6_SKYLAKE_MOBILE: /* SKL */
-        case INTEL_FAM6_CANNONLAKE_MOBILE:      /* CNL */
+        case INTEL_FAM6_SKYLAKE_L:      /* SKL */
+        case INTEL_FAM6_CANNONLAKE_L:   /* CNL */
                 pkg_cstate_limits = hsw_pkg_cstate_limits;
                 has_misc_feature_control = 1;
                 break;
@@ -3409,8 +3409,8 @@ int has_config_tdp(unsigned int family, unsigned int model)
         case INTEL_FAM6_BROADWELL:      /* BDW */
         case INTEL_FAM6_BROADWELL_GT3E: /* BDW */
         case INTEL_FAM6_BROADWELL_X:    /* BDX */
-        case INTEL_FAM6_SKYLAKE_MOBILE: /* SKL */
-        case INTEL_FAM6_CANNONLAKE_MOBILE:      /* CNL */
+        case INTEL_FAM6_SKYLAKE_L:      /* SKL */
+        case INTEL_FAM6_CANNONLAKE_L:   /* CNL */
         case INTEL_FAM6_SKYLAKE_X:      /* SKX */
 
         case INTEL_FAM6_XEON_PHI_KNL:   /* Knights Landing */
@@ -3863,8 +3863,8 @@ void rapl_probe_intel(unsigned int family, unsigned int model)
                 else
                         BIC_PRESENT(BIC_PkgWatt);
                 break;
-        case INTEL_FAM6_SKYLAKE_MOBILE: /* SKL */
-        case INTEL_FAM6_CANNONLAKE_MOBILE:      /* CNL */
+        case INTEL_FAM6_SKYLAKE_L:      /* SKL */
+        case INTEL_FAM6_CANNONLAKE_L:   /* CNL */
                 do_rapl = RAPL_PKG | RAPL_CORES | RAPL_CORE_POLICY | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_GFX | RAPL_PKG_POWER_INFO;
                 BIC_PRESENT(BIC_PKG__);
                 BIC_PRESENT(BIC_RAM__);
@@ -4255,8 +4255,8 @@ int has_snb_msrs(unsigned int family, unsigned int model)
         case INTEL_FAM6_BROADWELL:      /* BDW */
         case INTEL_FAM6_BROADWELL_GT3E: /* BDW */
         case INTEL_FAM6_BROADWELL_X:    /* BDX */
-        case INTEL_FAM6_SKYLAKE_MOBILE: /* SKL */
-        case INTEL_FAM6_CANNONLAKE_MOBILE:      /* CNL */
+        case INTEL_FAM6_SKYLAKE_L:      /* SKL */
+        case INTEL_FAM6_CANNONLAKE_L:   /* CNL */
         case INTEL_FAM6_SKYLAKE_X:      /* SKX */
         case INTEL_FAM6_ATOM_GOLDMONT:  /* BXT */
         case INTEL_FAM6_ATOM_GOLDMONT_PLUS:
@@ -4286,8 +4286,8 @@ int has_hsw_msrs(unsigned int family, unsigned int model)
         switch (model) {
         case INTEL_FAM6_HASWELL:
         case INTEL_FAM6_BROADWELL:      /* BDW */
-        case INTEL_FAM6_SKYLAKE_MOBILE: /* SKL */
-        case INTEL_FAM6_CANNONLAKE_MOBILE:      /* CNL */
+        case INTEL_FAM6_SKYLAKE_L:      /* SKL */
+        case INTEL_FAM6_CANNONLAKE_L:   /* CNL */
         case INTEL_FAM6_ATOM_GOLDMONT:  /* BXT */
         case INTEL_FAM6_ATOM_GOLDMONT_PLUS:
                 return 1;
@@ -4309,8 +4309,8 @@ int has_skl_msrs(unsigned int family, unsigned int model)
                 return 0;
 
         switch (model) {
-        case INTEL_FAM6_SKYLAKE_MOBILE: /* SKL */
-        case INTEL_FAM6_CANNONLAKE_MOBILE:      /* CNL */
+        case INTEL_FAM6_SKYLAKE_L:      /* SKL */
+        case INTEL_FAM6_CANNONLAKE_L:   /* CNL */
                 return 1;
         }
         return 0;
@@ -4345,7 +4345,7 @@ int is_cnl(unsigned int family, unsigned int model)
                 return 0;
 
         switch (model) {
-        case INTEL_FAM6_CANNONLAKE_MOBILE: /* CNL */
+        case INTEL_FAM6_CANNONLAKE_L: /* CNL */
                 return 1;
         }
 
@@ -4568,21 +4568,21 @@ unsigned int intel_model_duplicates(unsigned int model)
         case INTEL_FAM6_XEON_PHI_KNM:
                 return INTEL_FAM6_XEON_PHI_KNL;
 
-        case INTEL_FAM6_HASWELL_ULT:
+        case INTEL_FAM6_HASWELL_L:
                 return INTEL_FAM6_HASWELL;
 
         case INTEL_FAM6_BROADWELL_X:
         case INTEL_FAM6_BROADWELL_XEON_D:       /* BDX-DE */
                 return INTEL_FAM6_BROADWELL_X;
 
-        case INTEL_FAM6_SKYLAKE_MOBILE:
+        case INTEL_FAM6_SKYLAKE_L:
         case INTEL_FAM6_SKYLAKE:
-        case INTEL_FAM6_KABYLAKE_MOBILE:
+        case INTEL_FAM6_KABYLAKE_L:
         case INTEL_FAM6_KABYLAKE:
-                return INTEL_FAM6_SKYLAKE_MOBILE;
+                return INTEL_FAM6_SKYLAKE_L;
 
-        case INTEL_FAM6_ICELAKE_MOBILE:
-                return INTEL_FAM6_CANNONLAKE_MOBILE;
+        case INTEL_FAM6_ICELAKE_L:
+                return INTEL_FAM6_CANNONLAKE_L;
         }
         return model;
 }
@@ -4731,7 +4731,7 @@ void process_cpuid()
 
                         if (crystal_hz == 0)
                                 switch(model) {
-                                case INTEL_FAM6_SKYLAKE_MOBILE: /* SKL */
+                                case INTEL_FAM6_SKYLAKE_L:      /* SKL */
                                         crystal_hz = 24000000;  /* 24.0 MHz */
                                         break;
                                 case INTEL_FAM6_ATOM_GOLDMONT_X:        /* DNV */