x86/cpu: Rename and move CPU model entry for Diamond Rapids
Subsystems (5)
Tony Luck
maintainerPATCH 1/1 x86/cpu: Rename and move CPU model entry for Diamond Rapids
This model was added as INTEL_PANTHERCOVE_X (based on the name of the core) with a comment that the platform name is Diamond Rapids. It was also placed at the end of the file in a new section for family 19 processors.
This is different from previous naming. Andrew Cooper complained. PeterZ agreed and posted a patch[1] to fix the name and move it in sequence with other Xeon servers. But without a commit description or sign-off the patch wasn't ever applied.
Patch updated to cover one additional use of the #define by turbostat and to change the "Family 6" comment to also list 18 and 19 since new models in these families are mixed in with family 6.
--- arch/x86/include/asm/intel-family.h | 7 +++---- .../platform/x86/intel/speed_select_if/isst_if_common.c | 2 +- drivers/platform/x86/intel/tpmi_power_domains.c | 2 +- tools/power/x86/turbostat/turbostat.c | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-)
arch/x86/include/asm/intel-family.h +3 -4
@@ -51,7 +51,7 @@#define INTEL_PENTIUM_MMX IFM(5, 0x04)/* P55C */ #define INTEL_QUARK_X1000 IFM(5, 0x09)/* Quark X1000 SoC */ -/* Family 6 */ +/* Family 6, 18, 19 */ #define INTEL_PENTIUM_PRO IFM(6, 0x01)#define INTEL_PENTIUM_II_KLAMATH IFM(6, 0x03)#define INTEL_PENTIUM_III_DESCHUTES IFM(6, 0x05)
@@ -126,6 +126,8 @@#define INTEL_GRANITERAPIDS_X IFM(6, 0xAD)/* Redwood Cove */ #define INTEL_GRANITERAPIDS_D IFM(6, 0xAE) +#define INTEL_DIAMONDRAPIDS_X IFM(19, 0x01)/* Panther Cove */ +#define INTEL_BARTLETTLAKE IFM(6, 0xD7)/* Raptor Cove */ /* "Hybrid" Processors (P-Core/E-Core) */
@@ -203,9 +205,6 @@#define INTEL_P4_PRESCOTT_2M IFM(15, 0x04)#define INTEL_P4_CEDARMILL IFM(15, 0x06)/* Also Xeon Dempsey */ -/* Family 19 */ -#define INTEL_PANTHERCOVE_X IFM(19, 0x01)/* Diamond Rapids */ -/* * Intel CPU core types *
drivers/platform/x86/intel/speed_select_if/isst_if_common.c +1 -1
@@ -790,7 +790,7 @@ static const struct x86_cpu_id isst_cpu_ids[] = {X86_MATCH_VFM (INTEL_GRANITERAPIDS_X ,SST_HPM_SUPPORTED ),X86_MATCH_VFM (INTEL_ICELAKE_D ,0 ),X86_MATCH_VFM (INTEL_ICELAKE_X ,0 ), -X86_MATCH_VFM (INTEL_PANTHERCOVE_X ,SST_HPM_SUPPORTED ), +X86_MATCH_VFM (INTEL_DIAMONDRAPIDS_X ,SST_HPM_SUPPORTED ),X86_MATCH_VFM (INTEL_SAPPHIRERAPIDS_X ,0 ), X86_MATCH_VFM(INTEL_SKYLAKE_X, SST_MBOX_SUPPORTED), {}
drivers/platform/x86/intel/tpmi_power_domains.c +1 -1
@@ -85,7 +85,7 @@ static const struct x86_cpu_id tpmi_cpu_ids[] = {X86_MATCH_VFM (INTEL_ATOM_CRESTMONT ,NULL ),X86_MATCH_VFM (INTEL_ATOM_DARKMONT_X ,NULL ),X86_MATCH_VFM (INTEL_GRANITERAPIDS_D ,NULL ), -X86_MATCH_VFM (INTEL_PANTHERCOVE_X ,NULL ), +X86_MATCH_VFM (INTEL_DIAMONDRAPIDS_X ,NULL ), {} };MODULE_DEVICE_TABLE (x86cpu, tpmi_cpu_ids);
tools/power/x86/turbostat/turbostat.c +1 -1
@@ -1195,7 +1195,7 @@ static const struct platform_data turbostat_pdata[] = { { INTEL_EMERALDRAPIDS_X, &spr_features }, { INTEL_GRANITERAPIDS_X, &spr_features }, { INTEL_GRANITERAPIDS_D, &spr_features }, - { INTEL_PANTHERCOVE_X, &dmr_features }, + { INTEL_DIAMONDRAPIDS_X, &dmr_features }, { INTEL_LAKEFIELD, &cnl_features }, { INTEL_ALDERLAKE, &adl_features }, { INTEL_ALDERLAKE_L, &adl_features },
Signature · 1 line
2.50.1
On 8/11/2025 2:33 PM, Tony Luck wrote:
...
Quoted 6 lines
PeterZ agreed and posted a patch[1] to fix the name and move it in sequence with other Xeon servers. But without a commit description or sign-off the patch wasn't ever applied.
Patch updated to cover one additional use of the #define by turbostat and to
Some of this patch handling information doesn't seem relevant to the commit message. It can probably go below the --- line or skipped while applying the patch.
...
Quoted 4 lines
Originally-by Peter Zijlstra <[email protected]>Signed-off-by Tony Luck <[email protected]>---