Commit 0cfd8fba authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

x86/cpu: Fix Crestmont uarch 



Sierra Forest and Grand Ridge are both E-core only using Crestmont
micro-architecture, They fit the pre-existing naming scheme prefectly
fine, adhere to it.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20230807150405.757666627@infradead.org
parent 882cdb06

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

+2 −3
Original line number Diff line number Diff line
@@ -155,9 +155,8 @@ 


#define INTEL_FAM6_ATOM_GRACEMONT	0xBE /* Alderlake N */



#define INTEL_FAM6_SIERRAFOREST_X	0xAF



#define INTEL_FAM6_GRANDRIDGE		0xB6

#define INTEL_FAM6_ATOM_CRESTMONT_X	0xAF /* Sierra Forest */

#define INTEL_FAM6_ATOM_CRESTMONT	0xB6 /* Grand Ridge */



/* Xeon Phi */

drivers/edac/i10nm_base.c

+1 −1
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ static const struct x86_cpu_id i10nm_cpuids[] = { 
	X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SAPPHIRERAPIDS_X,	X86_STEPPINGS(0x0, 0xf), &spr_cfg),

	X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(EMERALDRAPIDS_X,	X86_STEPPINGS(0x0, 0xf), &spr_cfg),

	X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(GRANITERAPIDS_X,	X86_STEPPINGS(0x0, 0xf), &gnr_cfg),

	X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SIERRAFOREST_X,	X86_STEPPINGS(0x0, 0xf), &gnr_cfg),

	X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(ATOM_CRESTMONT_X,	X86_STEPPINGS(0x0, 0xf), &gnr_cfg),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, i10nm_cpuids);

drivers/platform/x86/intel/speed_select_if/isst_if_common.c

+1 −1
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ static struct miscdevice isst_if_char_driver = { 


static const struct x86_cpu_id hpm_cpu_ids[] = {

	X86_MATCH_INTEL_FAM6_MODEL(GRANITERAPIDS_X,	NULL),

	X86_MATCH_INTEL_FAM6_MODEL(SIERRAFOREST_X,	NULL),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT_X,	NULL),

	{}

};