Commit 70d1d989 authored by Tony Luck's avatar Tony Luck Committed by Ingo Molnar
Browse files

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 as Andrew Cooper noted.
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.

Originally-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Link: https://lore.kernel.org/all/20250214130205.GK14028@noisy.programming.kicks-ass.net/ # [1]
parent fa1d1171

arch/x86/include/asm/intel-family.h

+3 −4
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 },