x86/cpu: Get rid of the smp_store_cpu_info() indirection

smp_store_cpu_info() is just a wrapper around identify_secondary_cpu()
without further value.

Move the extra bits from smp_store_cpu_info() into identify_secondary_cpu()
and remove the wrapper.

[ darwi: Make it compile and fix up the xen/smp_pv.c instance ]

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-9-darwi@linutronix.de

diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 0ea227fa027c51e64de125733338fe39056d169e..d5d9a071cddc924f2ab0023fb79c406724324609 100644 (file)
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -229,7 +229,7 @@ static inline unsigned long long l1tf_pfn_limit(void)
 void init_cpu_devs(void);
 void get_cpu_vendor(struct cpuinfo_x86 *c);
 extern void early_cpu_init(void);
-extern void identify_secondary_cpu(struct cpuinfo_x86 *);
+extern void identify_secondary_cpu(unsigned int cpu);
 extern void print_cpu_info(struct cpuinfo_x86 *);
 void print_cpu_msr(struct cpuinfo_x86 *);
 

diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 1d3b11eba084d1fcd4478d7b9349dff81d55e930..128e06a18e51b17ac904184c6293bebc0374d131 100644 (file)
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -120,8 +120,6 @@ void native_smp_send_reschedule(int cpu);
 void native_send_call_func_ipi(const struct cpumask *mask);
 void native_send_call_func_single_ipi(int cpu);
 
-void smp_store_cpu_info(int id);
-
 asmlinkage __visible void smp_reboot_interrupt(void);
 __visible void smp_reschedule_interrupt(struct pt_regs *regs);
 __visible void smp_call_function_interrupt(struct pt_regs *regs);

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 3a1a957e0c60e6a7b7f899147b71822aed8b9b78..5f81c553e733dc2b060e96f433eee01f70c90011 100644 (file)
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1997,9 +1997,15 @@ static __init void identify_boot_cpu(void)
        lkgs_init();
 }
 
-void identify_secondary_cpu(struct cpuinfo_x86 *c)
+void identify_secondary_cpu(unsigned int cpu)
 {
-       BUG_ON(c == &boot_cpu_data);
+       struct cpuinfo_x86 *c = &cpu_data(cpu);
+
+       /* Copy boot_cpu_data only on the first bringup */
+       if (!c->initialized)
+               *c = boot_cpu_data;
+       c->cpu_index = cpu;
+
        identify_cpu(c);
 #ifdef CONFIG_X86_32
        enable_sep_cpu();
@@ -2010,6 +2016,7 @@ void identify_secondary_cpu(struct cpuinfo_x86 *c)
                update_gds_msr();
 
        tsx_ap_init();
+       c->initialized = true;
 }
 
 void print_cpu_info(struct cpuinfo_x86 *c)

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 5746084bafe4460ae5b17d987f8010c9da2f1817..8ecf1bf5710386ca0d3d70d3a8cb0a41ed92ee39 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -190,7 +190,7 @@ static void ap_starting(void)
        apic_ap_setup();
 
        /* Save the processor parameters. */
-       smp_store_cpu_info(cpuid);
+       identify_secondary_cpu(cpuid);
 
        /*
         * The topology information must be up to date before
@@ -215,7 +215,7 @@ static void ap_calibrate_delay(void)
 {
        /*
         * Calibrate the delay loop and update loops_per_jiffy in cpu_data.
-        * smp_store_cpu_info() stored a value that is close but not as
+        * identify_secondary_cpu() stored a value that is close but not as
         * accurate as the value just calculated.
         *
         * As this is invoked after the TSC synchronization check,
@@ -315,26 +315,6 @@ static void notrace start_secondary(void *unused)
        cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
 }
 
-/*
- * The bootstrap kernel entry code has set these up. Save them for
- * a given CPU
- */
-void smp_store_cpu_info(int id)
-{
-       struct cpuinfo_x86 *c = &cpu_data(id);
-
-       /* Copy boot_cpu_data only on the first bringup */
-       if (!c->initialized)
-               *c = boot_cpu_data;
-       c->cpu_index = id;
-       /*
-        * During boot time, CPU0 has this setup already. Save the info when
-        * bringing up an AP.
-        */
-       identify_secondary_cpu(c);
-       c->initialized = true;
-}
-
 static bool
 topology_same_node(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
 {

diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c
index 6863d3da7decfc9f6c78cac30aebbce9da46f6f9..688ff59318ae22006da4953a012f105057947b63 100644 (file)
--- a/arch/x86/xen/smp_pv.c
+++ b/arch/x86/xen/smp_pv.c
@@ -70,7 +70,7 @@ static void cpu_bringup(void)
                xen_enable_syscall();
        }
        cpu = smp_processor_id();
-       smp_store_cpu_info(cpu);
+       identify_secondary_cpu(cpu);
        set_cpu_sibling_map(cpu);
 
        speculative_store_bypass_ht_init();