Skip to content

Commit 744866f

Browse files
aeglhansendc
aegl
authored and
hansendc
committed
x86/cpu: Switch to new Intel CPU model defines
New CPU #defines encode vendor and family as well as model. Update INTEL_CPU_DESC() to work with vendor/family/model. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Link: https://lore.kernel.org/all/20240520224620.9480-34-tony.luck%40intel.com
1 parent d142df1 commit 744866f

2 files changed

Lines changed: 36 additions & 36 deletions

File tree

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

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5187,35 +5187,35 @@ static __init void intel_clovertown_quirk(void)
51875187
}
51885188

51895189
static const struct x86_cpu_desc isolation_ucodes[] = {
5190-
INTEL_CPU_DESC(INTEL_FAM6_HASWELL, 3, 0x0000001f),
5191-
INTEL_CPU_DESC(INTEL_FAM6_HASWELL_L, 1, 0x0000001e),
5192-
INTEL_CPU_DESC(INTEL_FAM6_HASWELL_G, 1, 0x00000015),
5193-
INTEL_CPU_DESC(INTEL_FAM6_HASWELL_X, 2, 0x00000037),
5194-
INTEL_CPU_DESC(INTEL_FAM6_HASWELL_X, 4, 0x0000000a),
5195-
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL, 4, 0x00000023),
5196-
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_G, 1, 0x00000014),
5197-
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D, 2, 0x00000010),
5198-
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D, 3, 0x07000009),
5199-
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D, 4, 0x0f000009),
5200-
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D, 5, 0x0e000002),
5201-
INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_X, 1, 0x0b000014),
5202-
INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 3, 0x00000021),
5203-
INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 4, 0x00000000),
5204-
INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 5, 0x00000000),
5205-
INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 6, 0x00000000),
5206-
INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 7, 0x00000000),
5207-
INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 11, 0x00000000),
5208-
INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_L, 3, 0x0000007c),
5209-
INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE, 3, 0x0000007c),
5210-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 9, 0x0000004e),
5211-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_L, 9, 0x0000004e),
5212-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_L, 10, 0x0000004e),
5213-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_L, 11, 0x0000004e),
5214-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_L, 12, 0x0000004e),
5215-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 10, 0x0000004e),
5216-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 11, 0x0000004e),
5217-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 12, 0x0000004e),
5218-
INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 13, 0x0000004e),
5190+
INTEL_CPU_DESC(INTEL_HASWELL, 3, 0x0000001f),
5191+
INTEL_CPU_DESC(INTEL_HASWELL_L, 1, 0x0000001e),
5192+
INTEL_CPU_DESC(INTEL_HASWELL_G, 1, 0x00000015),
5193+
INTEL_CPU_DESC(INTEL_HASWELL_X, 2, 0x00000037),
5194+
INTEL_CPU_DESC(INTEL_HASWELL_X, 4, 0x0000000a),
5195+
INTEL_CPU_DESC(INTEL_BROADWELL, 4, 0x00000023),
5196+
INTEL_CPU_DESC(INTEL_BROADWELL_G, 1, 0x00000014),
5197+
INTEL_CPU_DESC(INTEL_BROADWELL_D, 2, 0x00000010),
5198+
INTEL_CPU_DESC(INTEL_BROADWELL_D, 3, 0x07000009),
5199+
INTEL_CPU_DESC(INTEL_BROADWELL_D, 4, 0x0f000009),
5200+
INTEL_CPU_DESC(INTEL_BROADWELL_D, 5, 0x0e000002),
5201+
INTEL_CPU_DESC(INTEL_BROADWELL_X, 1, 0x0b000014),
5202+
INTEL_CPU_DESC(INTEL_SKYLAKE_X, 3, 0x00000021),
5203+
INTEL_CPU_DESC(INTEL_SKYLAKE_X, 4, 0x00000000),
5204+
INTEL_CPU_DESC(INTEL_SKYLAKE_X, 5, 0x00000000),
5205+
INTEL_CPU_DESC(INTEL_SKYLAKE_X, 6, 0x00000000),
5206+
INTEL_CPU_DESC(INTEL_SKYLAKE_X, 7, 0x00000000),
5207+
INTEL_CPU_DESC(INTEL_SKYLAKE_X, 11, 0x00000000),
5208+
INTEL_CPU_DESC(INTEL_SKYLAKE_L, 3, 0x0000007c),
5209+
INTEL_CPU_DESC(INTEL_SKYLAKE, 3, 0x0000007c),
5210+
INTEL_CPU_DESC(INTEL_KABYLAKE, 9, 0x0000004e),
5211+
INTEL_CPU_DESC(INTEL_KABYLAKE_L, 9, 0x0000004e),
5212+
INTEL_CPU_DESC(INTEL_KABYLAKE_L, 10, 0x0000004e),
5213+
INTEL_CPU_DESC(INTEL_KABYLAKE_L, 11, 0x0000004e),
5214+
INTEL_CPU_DESC(INTEL_KABYLAKE_L, 12, 0x0000004e),
5215+
INTEL_CPU_DESC(INTEL_KABYLAKE, 10, 0x0000004e),
5216+
INTEL_CPU_DESC(INTEL_KABYLAKE, 11, 0x0000004e),
5217+
INTEL_CPU_DESC(INTEL_KABYLAKE, 12, 0x0000004e),
5218+
INTEL_CPU_DESC(INTEL_KABYLAKE, 13, 0x0000004e),
52195219
{}
52205220
};
52215221

@@ -5232,9 +5232,9 @@ static __init void intel_pebs_isolation_quirk(void)
52325232
}
52335233

52345234
static const struct x86_cpu_desc pebs_ucodes[] = {
5235-
INTEL_CPU_DESC(INTEL_FAM6_SANDYBRIDGE, 7, 0x00000028),
5236-
INTEL_CPU_DESC(INTEL_FAM6_SANDYBRIDGE_X, 6, 0x00000618),
5237-
INTEL_CPU_DESC(INTEL_FAM6_SANDYBRIDGE_X, 7, 0x0000070c),
5235+
INTEL_CPU_DESC(INTEL_SANDYBRIDGE, 7, 0x00000028),
5236+
INTEL_CPU_DESC(INTEL_SANDYBRIDGE_X, 6, 0x00000618),
5237+
INTEL_CPU_DESC(INTEL_SANDYBRIDGE_X, 7, 0x0000070c),
52385238
{}
52395239
};
52405240

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,10 @@ struct x86_cpu_desc {
280280
u32 x86_microcode_rev;
281281
};
282282

283-
#define INTEL_CPU_DESC(model, stepping, revision) { \
284-
.x86_family = 6, \
285-
.x86_vendor = X86_VENDOR_INTEL, \
286-
.x86_model = (model), \
283+
#define INTEL_CPU_DESC(vfm, stepping, revision) { \
284+
.x86_family = VFM_FAMILY(vfm), \
285+
.x86_vendor = VFM_VENDOR(vfm), \
286+
.x86_model = VFM_MODEL(vfm), \
287287
.x86_stepping = (stepping), \
288288
.x86_microcode_rev = (revision), \
289289
}

0 commit comments

Comments
 (0)