x86/cpu: Remove unused TLB strings

Commit:

  e0ba94f14f74 ("x86/tlb_info: get last level TLB entry number of CPU")

added the TLB table for parsing CPUID(0x4), including strings
describing them. The string entry in the table was never used.

Convert them to comments.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ahmed S. Darwish <darwi@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20250304085152.51092-10-darwi@linutronix.de

diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h
index 1beccefbaff9a5a50f83c944cd8267d65f484085..51deb60a9d2674a17f931aee79f4a81c6f0eed7b 100644 (file)
--- a/arch/x86/kernel/cpu/cpu.h
+++ b/arch/x86/kernel/cpu/cpu.h
@@ -33,14 +33,6 @@ struct cpu_dev {
 #endif
 };
 
-struct _tlb_table {
-       unsigned char descriptor;
-       char tlb_type;
-       unsigned int entries;
-       /* unsigned int ways; */
-       char info[128];
-};
-
 #define cpu_dev_register(cpu_devX) \
        static const struct cpu_dev *const __cpu_dev_##cpu_devX __used \
        __section(".x86_cpu_dev.init") = \

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 61d3fd31baeeb6d7ba554c56ac70ed231ee7ac5f..291c82816797ec9cac5882da78db321db2960586 100644 (file)
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -658,44 +658,50 @@ static unsigned int intel_size_cache(struct cpuinfo_x86 *c, unsigned int size)
  */
 #define TLB_0x63_2M_4M_ENTRIES 32
 
+struct _tlb_table {
+       unsigned char descriptor;
+       char tlb_type;
+       unsigned int entries;
+};
+
 static const struct _tlb_table intel_tlb_table[] = {
-       { 0x01, TLB_INST_4K,            32,     " TLB_INST 4 KByte pages, 4-way set associative" },
-       { 0x02, TLB_INST_4M,            2,      " TLB_INST 4 MByte pages, full associative" },
-       { 0x03, TLB_DATA_4K,            64,     " TLB_DATA 4 KByte pages, 4-way set associative" },
-       { 0x04, TLB_DATA_4M,            8,      " TLB_DATA 4 MByte pages, 4-way set associative" },
-       { 0x05, TLB_DATA_4M,            32,     " TLB_DATA 4 MByte pages, 4-way set associative" },
-       { 0x0b, TLB_INST_4M,            4,      " TLB_INST 4 MByte pages, 4-way set associative" },
-       { 0x4f, TLB_INST_4K,            32,     " TLB_INST 4 KByte pages" },
-       { 0x50, TLB_INST_ALL,           64,     " TLB_INST 4 KByte and 2-MByte or 4-MByte pages" },
-       { 0x51, TLB_INST_ALL,           128,    " TLB_INST 4 KByte and 2-MByte or 4-MByte pages" },
-       { 0x52, TLB_INST_ALL,           256,    " TLB_INST 4 KByte and 2-MByte or 4-MByte pages" },
-       { 0x55, TLB_INST_2M_4M,         7,      " TLB_INST 2-MByte or 4-MByte pages, fully associative" },
-       { 0x56, TLB_DATA0_4M,           16,     " TLB_DATA0 4 MByte pages, 4-way set associative" },
-       { 0x57, TLB_DATA0_4K,           16,     " TLB_DATA0 4 KByte pages, 4-way associative" },
-       { 0x59, TLB_DATA0_4K,           16,     " TLB_DATA0 4 KByte pages, fully associative" },
-       { 0x5a, TLB_DATA0_2M_4M,        32,     " TLB_DATA0 2-MByte or 4 MByte pages, 4-way set associative" },
-       { 0x5b, TLB_DATA_4K_4M,         64,     " TLB_DATA 4 KByte and 4 MByte pages" },
-       { 0x5c, TLB_DATA_4K_4M,         128,    " TLB_DATA 4 KByte and 4 MByte pages" },
-       { 0x5d, TLB_DATA_4K_4M,         256,    " TLB_DATA 4 KByte and 4 MByte pages" },
-       { 0x61, TLB_INST_4K,            48,     " TLB_INST 4 KByte pages, full associative" },
-       { 0x63, TLB_DATA_1G_2M_4M,      4,      " TLB_DATA 1 GByte pages, 4-way set associative"
-                                               " (plus 32 entries TLB_DATA 2 MByte or 4 MByte pages, not encoded here)" },
-       { 0x6b, TLB_DATA_4K,            256,    " TLB_DATA 4 KByte pages, 8-way associative" },
-       { 0x6c, TLB_DATA_2M_4M,         128,    " TLB_DATA 2 MByte or 4 MByte pages, 8-way associative" },
-       { 0x6d, TLB_DATA_1G,            16,     " TLB_DATA 1 GByte pages, fully associative" },
-       { 0x76, TLB_INST_2M_4M,         8,      " TLB_INST 2-MByte or 4-MByte pages, fully associative" },
-       { 0xb0, TLB_INST_4K,            128,    " TLB_INST 4 KByte pages, 4-way set associative" },
-       { 0xb1, TLB_INST_2M_4M,         4,      " TLB_INST 2M pages, 4-way, 8 entries or 4M pages, 4-way entries" },
-       { 0xb2, TLB_INST_4K,            64,     " TLB_INST 4KByte pages, 4-way set associative" },
-       { 0xb3, TLB_DATA_4K,            128,    " TLB_DATA 4 KByte pages, 4-way set associative" },
-       { 0xb4, TLB_DATA_4K,            256,    " TLB_DATA 4 KByte pages, 4-way associative" },
-       { 0xb5, TLB_INST_4K,            64,     " TLB_INST 4 KByte pages, 8-way set associative" },
-       { 0xb6, TLB_INST_4K,            128,    " TLB_INST 4 KByte pages, 8-way set associative" },
-       { 0xba, TLB_DATA_4K,            64,     " TLB_DATA 4 KByte pages, 4-way associative" },
-       { 0xc0, TLB_DATA_4K_4M,         8,      " TLB_DATA 4 KByte and 4 MByte pages, 4-way associative" },
-       { 0xc1, STLB_4K_2M,             1024,   " STLB 4 KByte and 2 MByte pages, 8-way associative" },
-       { 0xc2, TLB_DATA_2M_4M,         16,     " TLB_DATA 2 MByte/4MByte pages, 4-way associative" },
-       { 0xca, STLB_4K,                512,    " STLB 4 KByte pages, 4-way associative" },
+       { 0x01, TLB_INST_4K,            32},    /* TLB_INST 4 KByte pages, 4-way set associative */
+       { 0x02, TLB_INST_4M,            2},     /* TLB_INST 4 MByte pages, full associative */
+       { 0x03, TLB_DATA_4K,            64},    /* TLB_DATA 4 KByte pages, 4-way set associative */
+       { 0x04, TLB_DATA_4M,            8},     /* TLB_DATA 4 MByte pages, 4-way set associative */
+       { 0x05, TLB_DATA_4M,            32},    /* TLB_DATA 4 MByte pages, 4-way set associative */
+       { 0x0b, TLB_INST_4M,            4},     /* TLB_INST 4 MByte pages, 4-way set associative */
+       { 0x4f, TLB_INST_4K,            32},    /* TLB_INST 4 KByte pages */
+       { 0x50, TLB_INST_ALL,           64},    /* TLB_INST 4 KByte and 2-MByte or 4-MByte pages */
+       { 0x51, TLB_INST_ALL,           128},   /* TLB_INST 4 KByte and 2-MByte or 4-MByte pages */
+       { 0x52, TLB_INST_ALL,           256},   /* TLB_INST 4 KByte and 2-MByte or 4-MByte pages */
+       { 0x55, TLB_INST_2M_4M,         7},     /* TLB_INST 2-MByte or 4-MByte pages, fully associative */
+       { 0x56, TLB_DATA0_4M,           16},    /* TLB_DATA0 4 MByte pages, 4-way set associative */
+       { 0x57, TLB_DATA0_4K,           16},    /* TLB_DATA0 4 KByte pages, 4-way associative */
+       { 0x59, TLB_DATA0_4K,           16},    /* TLB_DATA0 4 KByte pages, fully associative */
+       { 0x5a, TLB_DATA0_2M_4M,        32},    /* TLB_DATA0 2-MByte or 4 MByte pages, 4-way set associative */
+       { 0x5b, TLB_DATA_4K_4M,         64},    /* TLB_DATA 4 KByte and 4 MByte pages */
+       { 0x5c, TLB_DATA_4K_4M,         128},   /* TLB_DATA 4 KByte and 4 MByte pages */
+       { 0x5d, TLB_DATA_4K_4M,         256},   /* TLB_DATA 4 KByte and 4 MByte pages */
+       { 0x61, TLB_INST_4K,            48},    /* TLB_INST 4 KByte pages, full associative */
+       { 0x63, TLB_DATA_1G_2M_4M,      4},     /* TLB_DATA 1 GByte pages, 4-way set associative
+                                                * (plus 32 entries TLB_DATA 2 MByte or 4 MByte pages, not encoded here) */
+       { 0x6b, TLB_DATA_4K,            256},   /* TLB_DATA 4 KByte pages, 8-way associative */
+       { 0x6c, TLB_DATA_2M_4M,         128},   /* TLB_DATA 2 MByte or 4 MByte pages, 8-way associative */
+       { 0x6d, TLB_DATA_1G,            16},    /* TLB_DATA 1 GByte pages, fully associative */
+       { 0x76, TLB_INST_2M_4M,         8},     /* TLB_INST 2-MByte or 4-MByte pages, fully associative */
+       { 0xb0, TLB_INST_4K,            128},   /* TLB_INST 4 KByte pages, 4-way set associative */
+       { 0xb1, TLB_INST_2M_4M,         4},     /* TLB_INST 2M pages, 4-way, 8 entries or 4M pages, 4-way entries */
+       { 0xb2, TLB_INST_4K,            64},    /* TLB_INST 4KByte pages, 4-way set associative */
+       { 0xb3, TLB_DATA_4K,            128},   /* TLB_DATA 4 KByte pages, 4-way set associative */
+       { 0xb4, TLB_DATA_4K,            256},   /* TLB_DATA 4 KByte pages, 4-way associative */
+       { 0xb5, TLB_INST_4K,            64},    /* TLB_INST 4 KByte pages, 8-way set associative */
+       { 0xb6, TLB_INST_4K,            128},   /* TLB_INST 4 KByte pages, 8-way set associative */
+       { 0xba, TLB_DATA_4K,            64},    /* TLB_DATA 4 KByte pages, 4-way associative */
+       { 0xc0, TLB_DATA_4K_4M,         8},     /* TLB_DATA 4 KByte and 4 MByte pages, 4-way associative */
+       { 0xc1, STLB_4K_2M,             1024},  /* STLB 4 KByte and 2 MByte pages, 8-way associative */
+       { 0xc2, TLB_DATA_2M_4M,         16},    /* TLB_DATA 2 MByte/4MByte pages, 4-way associative */
+       { 0xca, STLB_4K,                512},   /* STLB 4 KByte pages, 4-way associative */
        { 0x00, 0, 0 }
 };