Merge tag 'x86-cleanups-2024-03-11' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / arch / x86 / include / asm / processor.h

diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index e2262aca65616991389a7683af82ba6cbd593965..8830133f220ca0da5767ae78cdcea15534fad8a7 100644 (file)
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -99,6 +99,9 @@ struct cpuinfo_topology {
        u32                     logical_pkg_id;
        u32                     logical_die_id;
 
+       // AMD Node ID and Nodes per Package info
+       u32                     amd_node_id;
+
        // Cache level topology IDs
        u32                     llc_id;
        u32                     l2c_id;
@@ -118,8 +121,6 @@ struct cpuinfo_x86 {
 #endif
        __u8                    x86_virt_bits;
        __u8                    x86_phys_bits;
-       /* CPUID returned core id bits: */
-       __u8                    x86_coreid_bits;
        /* Max extended CPUID function supported: */
        __u32                   extended_cpuid_level;
        /* Maximum supported CPUID level, -1=no CPUID: */
@@ -147,8 +148,6 @@ struct cpuinfo_x86 {
        unsigned long           loops_per_jiffy;
        /* protected processor identification number */
        u64                     ppin;
-       /* cpuid returned max cores value: */
-       u16                     x86_max_cores;
        u16                     x86_clflush_size;
        /* number of cores as seen by the OS: */
        u16                     booted_cores;
@@ -636,8 +635,10 @@ static __always_inline void prefetchw(const void *x)
 #else
 extern unsigned long __end_init_task[];
 
-#define INIT_THREAD {                                                      \
-       .sp     = (unsigned long)&__end_init_task - sizeof(struct pt_regs), \
+#define INIT_THREAD {                                                  \
+       .sp     = (unsigned long)&__end_init_task -                     \
+                 TOP_OF_KERNEL_STACK_PADDING -                         \
+                 sizeof(struct pt_regs),                               \
 }
 
 extern unsigned long KSTK_ESP(struct task_struct *task);
@@ -676,12 +677,10 @@ static inline u32 per_cpu_l2c_id(unsigned int cpu)
 }
 
 #ifdef CONFIG_CPU_SUP_AMD
-extern u32 amd_get_nodes_per_socket(void);
 extern u32 amd_get_highest_perf(void);
 extern void amd_clear_divider(void);
 extern void amd_check_microcode(void);
 #else
-static inline u32 amd_get_nodes_per_socket(void)       { return 0; }
 static inline u32 amd_get_highest_perf(void)           { return 0; }
 static inline void amd_clear_divider(void)             { }
 static inline void amd_check_microcode(void)           { }