x86/cacheinfo: Clarify type markers for CPUID leaf 0x2 cache descriptors

CPUID leaf 0x2 output is a stream of one-byte descriptors, each implying
certain details about the CPU's cache and TLB entries.

Two separate tables exist for interpreting these descriptors: one for
TLBs at intel.c and one for caches at cacheinfo.c.  These mapping tables
will be merged in further commits, among other improvements to their
model.

In preparation for this, use more descriptive type names for the leaf
0x2 descriptors associated with cpu caches.  Namely:

	LVL_1_INST	=>	CACHE_L1_INST
	LVL_1_DATA	=>	CACHE_L1_DATA
	LVL_2		=>	CACHE_L2
	LVL_3		=>	CACHE_L3

After the TLB and cache descriptors mapping tables are merged, this will
make it clear that such descriptors correspond to cpu caches.

Signed-off-by: Ahmed S. Darwish <darwi@linutronix.de>
Signed-off-by: Ingo 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-18-darwi@linutronix.de

diff --git a/arch/x86/kernel/cpu/cacheinfo.c b/arch/x86/kernel/cpu/cacheinfo.c
index 2aaa0f830ec39726894a1de0e2af30bce8ab33ad..626f55f960dc442a3bf761f25887fa0b518b4cf8 100644 (file)
--- a/arch/x86/kernel/cpu/cacheinfo.c
+++ b/arch/x86/kernel/cpu/cacheinfo.c
@@ -23,10 +23,10 @@
 
 #include "cpu.h"
 
-#define LVL_1_INST     1
-#define LVL_1_DATA     2
-#define LVL_2          3
-#define LVL_3          4
+#define CACHE_L1_INST  1
+#define CACHE_L1_DATA  2
+#define CACHE_L2       3
+#define CACHE_L3       4
 
 /* Shared last level cache maps */
 DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
@@ -52,74 +52,74 @@ struct _cache_table {
 
 static const struct _cache_table cache_table[] =
 {
-       { 0x06, LVL_1_INST, 8 },        /* 4-way set assoc, 32 byte line size */
-       { 0x08, LVL_1_INST, 16 },       /* 4-way set assoc, 32 byte line size */
-       { 0x09, LVL_1_INST, 32 },       /* 4-way set assoc, 64 byte line size */
-       { 0x0a, LVL_1_DATA, 8 },        /* 2 way set assoc, 32 byte line size */
-       { 0x0c, LVL_1_DATA, 16 },       /* 4-way set assoc, 32 byte line size */
-       { 0x0d, LVL_1_DATA, 16 },       /* 4-way set assoc, 64 byte line size */
-       { 0x0e, LVL_1_DATA, 24 },       /* 6-way set assoc, 64 byte line size */
-       { 0x21, LVL_2,      256 },      /* 8-way set assoc, 64 byte line size */
-       { 0x22, LVL_3,      512 },      /* 4-way set assoc, sectored cache, 64 byte line size */
-       { 0x23, LVL_3,      MB(1) },    /* 8-way set assoc, sectored cache, 64 byte line size */
-       { 0x25, LVL_3,      MB(2) },    /* 8-way set assoc, sectored cache, 64 byte line size */
-       { 0x29, LVL_3,      MB(4) },    /* 8-way set assoc, sectored cache, 64 byte line size */
-       { 0x2c, LVL_1_DATA, 32 },       /* 8-way set assoc, 64 byte line size */
-       { 0x30, LVL_1_INST, 32 },       /* 8-way set assoc, 64 byte line size */
-       { 0x39, LVL_2,      128 },      /* 4-way set assoc, sectored cache, 64 byte line size */
-       { 0x3a, LVL_2,      192 },      /* 6-way set assoc, sectored cache, 64 byte line size */
-       { 0x3b, LVL_2,      128 },      /* 2-way set assoc, sectored cache, 64 byte line size */
-       { 0x3c, LVL_2,      256 },      /* 4-way set assoc, sectored cache, 64 byte line size */
-       { 0x3d, LVL_2,      384 },      /* 6-way set assoc, sectored cache, 64 byte line size */
-       { 0x3e, LVL_2,      512 },      /* 4-way set assoc, sectored cache, 64 byte line size */
-       { 0x3f, LVL_2,      256 },      /* 2-way set assoc, 64 byte line size */
-       { 0x41, LVL_2,      128 },      /* 4-way set assoc, 32 byte line size */
-       { 0x42, LVL_2,      256 },      /* 4-way set assoc, 32 byte line size */
-       { 0x43, LVL_2,      512 },      /* 4-way set assoc, 32 byte line size */
-       { 0x44, LVL_2,      MB(1) },    /* 4-way set assoc, 32 byte line size */
-       { 0x45, LVL_2,      MB(2) },    /* 4-way set assoc, 32 byte line size */
-       { 0x46, LVL_3,      MB(4) },    /* 4-way set assoc, 64 byte line size */
-       { 0x47, LVL_3,      MB(8) },    /* 8-way set assoc, 64 byte line size */
-       { 0x48, LVL_2,      MB(3) },    /* 12-way set assoc, 64 byte line size */
-       { 0x49, LVL_3,      MB(4) },    /* 16-way set assoc, 64 byte line size */
-       { 0x4a, LVL_3,      MB(6) },    /* 12-way set assoc, 64 byte line size */
-       { 0x4b, LVL_3,      MB(8) },    /* 16-way set assoc, 64 byte line size */
-       { 0x4c, LVL_3,      MB(12) },   /* 12-way set assoc, 64 byte line size */
-       { 0x4d, LVL_3,      MB(16) },   /* 16-way set assoc, 64 byte line size */
-       { 0x4e, LVL_2,      MB(6) },    /* 24-way set assoc, 64 byte line size */
-       { 0x60, LVL_1_DATA, 16 },       /* 8-way set assoc, sectored cache, 64 byte line size */
-       { 0x66, LVL_1_DATA, 8 },        /* 4-way set assoc, sectored cache, 64 byte line size */
-       { 0x67, LVL_1_DATA, 16 },       /* 4-way set assoc, sectored cache, 64 byte line size */
-       { 0x68, LVL_1_DATA, 32 },       /* 4-way set assoc, sectored cache, 64 byte line size */
-       { 0x78, LVL_2,      MB(1) },    /* 4-way set assoc, 64 byte line size */
-       { 0x79, LVL_2,      128 },      /* 8-way set assoc, sectored cache, 64 byte line size */
-       { 0x7a, LVL_2,      256 },      /* 8-way set assoc, sectored cache, 64 byte line size */
-       { 0x7b, LVL_2,      512 },      /* 8-way set assoc, sectored cache, 64 byte line size */
-       { 0x7c, LVL_2,      MB(1) },    /* 8-way set assoc, sectored cache, 64 byte line size */
-       { 0x7d, LVL_2,      MB(2) },    /* 8-way set assoc, 64 byte line size */
-       { 0x7f, LVL_2,      512 },      /* 2-way set assoc, 64 byte line size */
-       { 0x80, LVL_2,      512 },      /* 8-way set assoc, 64 byte line size */
-       { 0x82, LVL_2,      256 },      /* 8-way set assoc, 32 byte line size */
-       { 0x83, LVL_2,      512 },      /* 8-way set assoc, 32 byte line size */
-       { 0x84, LVL_2,      MB(1) },    /* 8-way set assoc, 32 byte line size */
-       { 0x85, LVL_2,      MB(2) },    /* 8-way set assoc, 32 byte line size */
-       { 0x86, LVL_2,      512 },      /* 4-way set assoc, 64 byte line size */
-       { 0x87, LVL_2,      MB(1) },    /* 8-way set assoc, 64 byte line size */
-       { 0xd0, LVL_3,      512 },      /* 4-way set assoc, 64 byte line size */
-       { 0xd1, LVL_3,      MB(1) },    /* 4-way set assoc, 64 byte line size */
-       { 0xd2, LVL_3,      MB(2) },    /* 4-way set assoc, 64 byte line size */
-       { 0xd6, LVL_3,      MB(1) },    /* 8-way set assoc, 64 byte line size */
-       { 0xd7, LVL_3,      MB(2) },    /* 8-way set assoc, 64 byte line size */
-       { 0xd8, LVL_3,      MB(4) },    /* 12-way set assoc, 64 byte line size */
-       { 0xdc, LVL_3,      MB(2) },    /* 12-way set assoc, 64 byte line size */
-       { 0xdd, LVL_3,      MB(4) },    /* 12-way set assoc, 64 byte line size */
-       { 0xde, LVL_3,      MB(8) },    /* 12-way set assoc, 64 byte line size */
-       { 0xe2, LVL_3,      MB(2) },    /* 16-way set assoc, 64 byte line size */
-       { 0xe3, LVL_3,      MB(4) },    /* 16-way set assoc, 64 byte line size */
-       { 0xe4, LVL_3,      MB(8) },    /* 16-way set assoc, 64 byte line size */
-       { 0xea, LVL_3,      MB(12) },   /* 24-way set assoc, 64 byte line size */
-       { 0xeb, LVL_3,      MB(18) },   /* 24-way set assoc, 64 byte line size */
-       { 0xec, LVL_3,      MB(24) },   /* 24-way set assoc, 64 byte line size */
+       { 0x06, CACHE_L1_INST,  8       },      /* 4-way set assoc, 32 byte line size */
+       { 0x08, CACHE_L1_INST,  16      },      /* 4-way set assoc, 32 byte line size */
+       { 0x09, CACHE_L1_INST,  32      },      /* 4-way set assoc, 64 byte line size */
+       { 0x0a, CACHE_L1_DATA,  8       },      /* 2 way set assoc, 32 byte line size */
+       { 0x0c, CACHE_L1_DATA,  16      },      /* 4-way set assoc, 32 byte line size */
+       { 0x0d, CACHE_L1_DATA,  16      },      /* 4-way set assoc, 64 byte line size */
+       { 0x0e, CACHE_L1_DATA,  24      },      /* 6-way set assoc, 64 byte line size */
+       { 0x21, CACHE_L2,       256     },      /* 8-way set assoc, 64 byte line size */
+       { 0x22, CACHE_L3,       512     },      /* 4-way set assoc, sectored cache, 64 byte line size */
+       { 0x23, CACHE_L3,       MB(1)   },      /* 8-way set assoc, sectored cache, 64 byte line size */
+       { 0x25, CACHE_L3,       MB(2)   },      /* 8-way set assoc, sectored cache, 64 byte line size */
+       { 0x29, CACHE_L3,       MB(4)   },      /* 8-way set assoc, sectored cache, 64 byte line size */
+       { 0x2c, CACHE_L1_DATA,  32      },      /* 8-way set assoc, 64 byte line size */
+       { 0x30, CACHE_L1_INST,  32      },      /* 8-way set assoc, 64 byte line size */
+       { 0x39, CACHE_L2,       128     },      /* 4-way set assoc, sectored cache, 64 byte line size */
+       { 0x3a, CACHE_L2,       192     },      /* 6-way set assoc, sectored cache, 64 byte line size */
+       { 0x3b, CACHE_L2,       128     },      /* 2-way set assoc, sectored cache, 64 byte line size */
+       { 0x3c, CACHE_L2,       256     },      /* 4-way set assoc, sectored cache, 64 byte line size */
+       { 0x3d, CACHE_L2,       384     },      /* 6-way set assoc, sectored cache, 64 byte line size */
+       { 0x3e, CACHE_L2,       512     },      /* 4-way set assoc, sectored cache, 64 byte line size */
+       { 0x3f, CACHE_L2,       256     },      /* 2-way set assoc, 64 byte line size */
+       { 0x41, CACHE_L2,       128     },      /* 4-way set assoc, 32 byte line size */
+       { 0x42, CACHE_L2,       256     },      /* 4-way set assoc, 32 byte line size */
+       { 0x43, CACHE_L2,       512     },      /* 4-way set assoc, 32 byte line size */
+       { 0x44, CACHE_L2,       MB(1)   },      /* 4-way set assoc, 32 byte line size */
+       { 0x45, CACHE_L2,       MB(2)   },      /* 4-way set assoc, 32 byte line size */
+       { 0x46, CACHE_L3,       MB(4)   },      /* 4-way set assoc, 64 byte line size */
+       { 0x47, CACHE_L3,       MB(8)   },      /* 8-way set assoc, 64 byte line size */
+       { 0x48, CACHE_L2,       MB(3)   },      /* 12-way set assoc, 64 byte line size */
+       { 0x49, CACHE_L3,       MB(4)   },      /* 16-way set assoc, 64 byte line size */
+       { 0x4a, CACHE_L3,       MB(6)   },      /* 12-way set assoc, 64 byte line size */
+       { 0x4b, CACHE_L3,       MB(8)   },      /* 16-way set assoc, 64 byte line size */
+       { 0x4c, CACHE_L3,       MB(12)  },      /* 12-way set assoc, 64 byte line size */
+       { 0x4d, CACHE_L3,       MB(16)  },      /* 16-way set assoc, 64 byte line size */
+       { 0x4e, CACHE_L2,       MB(6)   },      /* 24-way set assoc, 64 byte line size */
+       { 0x60, CACHE_L1_DATA,  16      },      /* 8-way set assoc, sectored cache, 64 byte line size */
+       { 0x66, CACHE_L1_DATA,  8       },      /* 4-way set assoc, sectored cache, 64 byte line size */
+       { 0x67, CACHE_L1_DATA,  16      },      /* 4-way set assoc, sectored cache, 64 byte line size */
+       { 0x68, CACHE_L1_DATA,  32      },      /* 4-way set assoc, sectored cache, 64 byte line size */
+       { 0x78, CACHE_L2,       MB(1)   },      /* 4-way set assoc, 64 byte line size */
+       { 0x79, CACHE_L2,       128     },      /* 8-way set assoc, sectored cache, 64 byte line size */
+       { 0x7a, CACHE_L2,       256     },      /* 8-way set assoc, sectored cache, 64 byte line size */
+       { 0x7b, CACHE_L2,       512     },      /* 8-way set assoc, sectored cache, 64 byte line size */
+       { 0x7c, CACHE_L2,       MB(1)   },      /* 8-way set assoc, sectored cache, 64 byte line size */
+       { 0x7d, CACHE_L2,       MB(2)   },      /* 8-way set assoc, 64 byte line size */
+       { 0x7f, CACHE_L2,       512     },      /* 2-way set assoc, 64 byte line size */
+       { 0x80, CACHE_L2,       512     },      /* 8-way set assoc, 64 byte line size */
+       { 0x82, CACHE_L2,       256     },      /* 8-way set assoc, 32 byte line size */
+       { 0x83, CACHE_L2,       512     },      /* 8-way set assoc, 32 byte line size */
+       { 0x84, CACHE_L2,       MB(1)   },      /* 8-way set assoc, 32 byte line size */
+       { 0x85, CACHE_L2,       MB(2)   },      /* 8-way set assoc, 32 byte line size */
+       { 0x86, CACHE_L2,       512     },      /* 4-way set assoc, 64 byte line size */
+       { 0x87, CACHE_L2,       MB(1)   },      /* 8-way set assoc, 64 byte line size */
+       { 0xd0, CACHE_L3,       512     },      /* 4-way set assoc, 64 byte line size */
+       { 0xd1, CACHE_L3,       MB(1)   },      /* 4-way set assoc, 64 byte line size */
+       { 0xd2, CACHE_L3,       MB(2)   },      /* 4-way set assoc, 64 byte line size */
+       { 0xd6, CACHE_L3,       MB(1)   },      /* 8-way set assoc, 64 byte line size */
+       { 0xd7, CACHE_L3,       MB(2)   },      /* 8-way set assoc, 64 byte line size */
+       { 0xd8, CACHE_L3,       MB(4)   },      /* 12-way set assoc, 64 byte line size */
+       { 0xdc, CACHE_L3,       MB(2)   },      /* 12-way set assoc, 64 byte line size */
+       { 0xdd, CACHE_L3,       MB(4)   },      /* 12-way set assoc, 64 byte line size */
+       { 0xde, CACHE_L3,       MB(8)   },      /* 12-way set assoc, 64 byte line size */
+       { 0xe2, CACHE_L3,       MB(2)   },      /* 16-way set assoc, 64 byte line size */
+       { 0xe3, CACHE_L3,       MB(4)   },      /* 16-way set assoc, 64 byte line size */
+       { 0xe4, CACHE_L3,       MB(8)   },      /* 16-way set assoc, 64 byte line size */
+       { 0xea, CACHE_L3,       MB(12)  },      /* 24-way set assoc, 64 byte line size */
+       { 0xeb, CACHE_L3,       MB(18)  },      /* 24-way set assoc, 64 byte line size */
+       { 0xec, CACHE_L3,       MB(24)  },      /* 24-way set assoc, 64 byte line size */
 };
 
 
@@ -521,10 +521,10 @@ void init_intel_cacheinfo(struct cpuinfo_x86 *c)
                                continue;
 
                        switch (entry->cache_type) {
-                       case LVL_1_INST: l1i += entry->size; break;
-                       case LVL_1_DATA: l1d += entry->size; break;
-                       case LVL_2:      l2  += entry->size; break;
-                       case LVL_3:      l3  += entry->size; break;
+                       case CACHE_L1_INST:     l1i += entry->size; break;
+                       case CACHE_L1_DATA:     l1d += entry->size; break;
+                       case CACHE_L2:          l2  += entry->size; break;
+                       case CACHE_L3:          l3  += entry->size; break;
                        }
                }
        }