commit 6e23da2983f83c803cf4abfee542d7f90e8e9eb5
author Arthur Heymans <arthur@aheymans.xyz> Sat Nov 12 16:51:22 2022 +0100
committer Martin L Roth <gaumless@gmail.com> Sat Dec 10 17:54:53 2022 +0000
tree 4ed3551c36aa01c0097002c419965e6c3ea4e9e3
parent 2db459edb0936bbaf874f40a96e98cdfc6d5d5ce

cpu/cpu.h: Change the function signature

There is no need to pass the CPU index around.

Change-Id: Iad8e3cb318e6520ac5877118dbf43597dedb75b9
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69504
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>

src/arch/x86/cpu.c

diff --git a/src/arch/x86/cpu.c b/src/arch/x86/cpu.c
index face248..a51cadb 100644
--- a/src/arch/x86/cpu.c
+++ b/src/arch/x86/cpu.c
@@ -229,7 +229,7 @@
 	return cpus_default_apic_id[logical_cpu];
 }
 
-void cpu_initialize(unsigned int index)
+void cpu_initialize(void)
 {
 	/* Because we busy wait at the printk spinlock.
 	 * It is important to keep the number of printed messages
@@ -242,7 +242,7 @@
 
 	info = cpu_info();
 
-	printk(BIOS_INFO, "Initializing CPU #%d\n", index);
+	printk(BIOS_INFO, "Initializing CPU #%zd\n", info->index);
 
 	cpu = info->cpu;
 	if (!cpu)
@@ -284,7 +284,7 @@
 	}
 	post_log_clear();
 
-	printk(BIOS_INFO, "CPU #%d initialized\n", index);
+	printk(BIOS_INFO, "CPU #%zd initialized\n", info->index);
 }
 
 void lb_arch_add_records(struct lb_header *header)

src/cpu/x86/mp_init.c

diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index 758550c..acc1323 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -628,14 +628,6 @@
 	return bsp_do_flight_plan(p);
 }
 
-/* Calls cpu_initialize(info->index) which calls the coreboot CPU drivers. */
-static void mp_initialize_cpu(void)
-{
-	/* Call back into driver infrastructure for the AP initialization.   */
-	struct cpu_info *info = cpu_info();
-	cpu_initialize(info->index);
-}
-
 void smm_initiate_relocation_parallel(void)
 {
 	if (lapic_busy()) {
@@ -1078,7 +1070,7 @@
 	/* Perform SMM relocation. */
 	MP_FR_NOBLOCK_APS(trigger_smm_relocation, trigger_smm_relocation),
 	/* Initialize each CPU through the driver framework. */
-	MP_FR_BLOCK_APS(mp_initialize_cpu, mp_initialize_cpu),
+	MP_FR_BLOCK_APS(cpu_initialize, cpu_initialize),
 	/* Wait for APs to finish then optionally start looking for work. */
 	MP_FR_BLOCK_APS(ap_wait_for_instruction, NULL),
 };

src/include/cpu/cpu.h

diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h
index 955bd73..a77cb33 100644
--- a/src/include/cpu/cpu.h
+++ b/src/include/cpu/cpu.h
@@ -6,7 +6,7 @@
 #include <arch/cpu.h>  /* IWYU pragma: export */
 #include <stdint.h>
 
-void cpu_initialize(unsigned int cpu_index);
+void cpu_initialize(void);
 /* Returns default APIC id based on logical_cpu number or < 0 on failure. */
 int cpu_get_apic_id(int logical_cpu);
 uintptr_t cpu_get_lapic_addr(void);