Commit eeeebc4f authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Ingo Molnar
Browse files

x86/cacheinfo: Relocate CPUID leaf 0x4 cache_type mapping 



The cache_type_map[] array is used to map Intel leaf 0x4 cache_type
values to their corresponding types at <linux/cacheinfo.h>.

Move that array's definition after the actual CPUID leaf 0x4 structures,
instead of having it in the middle of AMD leaf 0x4 emulation code.

Signed-off-by: default avatarAhmed S. Darwish <darwi@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20250324133324.23458-28-darwi@linutronix.de
parent 05d48035

arch/x86/kernel/cpu/cacheinfo.c

+8 −7
Original line number Diff line number Diff line
@@ -78,6 +78,14 @@ struct _cpuid4_info { 
	unsigned long size;

};



/* Map CPUID(4) EAX.cache_type to linux/cacheinfo.h types */

static const enum cache_type cache_type_map[] = {

	[CTYPE_NULL]	= CACHE_TYPE_NOCACHE,

	[CTYPE_DATA]	= CACHE_TYPE_DATA,

	[CTYPE_INST]	= CACHE_TYPE_INST,

	[CTYPE_UNIFIED] = CACHE_TYPE_UNIFIED,

};



/*

 * Fallback AMD CPUID(4) emulation

 * AMD CPUs with TOPOEXT can just use CPUID(0x8000001d)
@@ -131,13 +139,6 @@ static const unsigned short assocs[] = { 
static const unsigned char levels[] = { 1, 1, 2, 3 };

static const unsigned char types[] = { 1, 2, 3, 3 };



static const enum cache_type cache_type_map[] = {

	[CTYPE_NULL] = CACHE_TYPE_NOCACHE,

	[CTYPE_DATA] = CACHE_TYPE_DATA,

	[CTYPE_INST] = CACHE_TYPE_INST,

	[CTYPE_UNIFIED] = CACHE_TYPE_UNIFIED,

};



static void legacy_amd_cpuid4(int index, union _cpuid4_leaf_eax *eax,

			      union _cpuid4_leaf_ebx *ebx, union _cpuid4_leaf_ecx *ecx)

{