diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2022-11-12 16:51:22 +0100 |
|---|---|---|
| committer | Martin L Roth <gaumless@gmail.com> | 2022-12-10 17:54:53 +0000 |
| commit | 6e23da2983f83c803cf4abfee542d7f90e8e9eb5 (patch) | |
| tree | 4ed3551c36aa01c0097002c419965e6c3ea4e9e3 /src | |
| parent | 2db459edb0936bbaf874f40a96e98cdfc6d5d5ce (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/x86/cpu.c | 6 | ||||
| -rw-r--r-- | src/cpu/x86/mp_init.c | 10 | ||||
| -rw-r--r-- | src/include/cpu/cpu.h | 2 |
3 files changed, 5 insertions, 13 deletions
diff --git a/src/arch/x86/cpu.c b/src/arch/x86/cpu.c index face248fc2..a51cadbee3 100644 --- a/src/arch/x86/cpu.c +++ b/src/arch/x86/cpu.c @@ -229,7 +229,7 @@ int cpu_get_apic_id(int logical_cpu) 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 @@ void cpu_initialize(unsigned int index) 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 @@ void cpu_initialize(unsigned int index) } 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) diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c index 758550c43d..acc1323967 100644 --- a/src/cpu/x86/mp_init.c +++ b/src/cpu/x86/mp_init.c @@ -628,14 +628,6 @@ static enum cb_err mp_init(struct bus *cpu_bus, struct mp_params *p) 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 @@ static struct mp_flight_record mp_steps[] = { /* 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), }; diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h index 955bd73fba..a77cb33b4a 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); |