GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpu/x86/mp_init: use cb_err as start_aps return type 

Using cb_err as return type clarifies the meaning of the different
return values.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Icb96f28b4d59b3d00638a43c927df80f5d1643f9
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58455
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Felix Held 2021-10-19 18:32:41 +02:00 committed by Felix Held
parent b5376ff972
commit 5911096e06
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cpu/x86/mp_init.c
View File

@ -448,14 +448,14 @@ static enum cb_err send_sipi_to_aps(int ap_count, atomic_t *num_aps, int sipi_ve
return CB_SUCCESS; return CB_SUCCESS;
} }
static int start_aps(struct bus *cpu_bus, int ap_count, atomic_t *num_aps) static enum cb_err start_aps(struct bus *cpu_bus, int ap_count, atomic_t *num_aps)
{ {
int sipi_vector; int sipi_vector;
/* Max location is 4KiB below 1MiB */ /* Max location is 4KiB below 1MiB */
const int max_vector_loc = ((1 << 20) - (1 << 12)) >> 12; const int max_vector_loc = ((1 << 20) - (1 << 12)) >> 12;
if (ap_count == 0) if (ap_count == 0)
return 0; return CB_SUCCESS;
/* The vector is sent as a 4k aligned address in one byte. */ /* The vector is sent as a 4k aligned address in one byte. */
sipi_vector = sipi_vector_location >> 12; sipi_vector = sipi_vector_location >> 12;
@ -463,7 +463,7 @@ static int start_aps(struct bus *cpu_bus, int ap_count, atomic_t *num_aps)
if (sipi_vector > max_vector_loc) { if (sipi_vector > max_vector_loc) {
printk(BIOS_CRIT, "SIPI vector too large! 0x%08x\n", printk(BIOS_CRIT, "SIPI vector too large! 0x%08x\n",
sipi_vector); sipi_vector);
return -1; return CB_ERR;
} }
printk(BIOS_DEBUG, "Attempting to start %d APs\n", ap_count); printk(BIOS_DEBUG, "Attempting to start %d APs\n", ap_count);
@ -475,7 +475,7 @@ static int start_aps(struct bus *cpu_bus, int ap_count, atomic_t *num_aps)
printk(BIOS_DEBUG, "Waiting for ICR not to be busy...\n"); printk(BIOS_DEBUG, "Waiting for ICR not to be busy...\n");
if (apic_wait_timeout(1000 /* 1 ms */, 50)) { if (apic_wait_timeout(1000 /* 1 ms */, 50)) {
printk(BIOS_ERR, "timed out. Aborting.\n"); printk(BIOS_ERR, "timed out. Aborting.\n");
return -1; return CB_ERR;
} }
printk(BIOS_DEBUG, "done.\n"); printk(BIOS_DEBUG, "done.\n");
} }
@ -490,26 +490,26 @@ static int start_aps(struct bus *cpu_bus, int ap_count, atomic_t *num_aps)
/* Send 1st Startup IPI (SIPI) */ /* Send 1st Startup IPI (SIPI) */
if (send_sipi_to_aps(ap_count, num_aps, sipi_vector) != CB_SUCCESS) if (send_sipi_to_aps(ap_count, num_aps, sipi_vector) != CB_SUCCESS)
return -1; return CB_ERR;
/* Wait for CPUs to check in up to 200 us. */ /* Wait for CPUs to check in up to 200 us. */
wait_for_aps(num_aps, ap_count, 200 /* us */, 15 /* us */); wait_for_aps(num_aps, ap_count, 200 /* us */, 15 /* us */);
if (CONFIG(X86_AMD_INIT_SIPI)) if (CONFIG(X86_AMD_INIT_SIPI))
return 0; return CB_SUCCESS;
/* Send 2nd SIPI */ /* Send 2nd SIPI */
if (send_sipi_to_aps(ap_count, num_aps, sipi_vector) != CB_SUCCESS) if (send_sipi_to_aps(ap_count, num_aps, sipi_vector) != CB_SUCCESS)
return -1; return CB_ERR;
/* Wait for CPUs to check in. */ /* Wait for CPUs to check in. */
if (wait_for_aps(num_aps, ap_count, 100000 /* 100 ms */, 50 /* us */)) { if (wait_for_aps(num_aps, ap_count, 100000 /* 100 ms */, 50 /* us */)) {
printk(BIOS_ERR, "Not all APs checked in: %d/%d.\n", printk(BIOS_ERR, "Not all APs checked in: %d/%d.\n",
atomic_read(num_aps), ap_count); atomic_read(num_aps), ap_count);
return -1; return CB_ERR;
} }
return 0; return CB_SUCCESS;
} }
static int bsp_do_flight_plan(struct mp_params *mp_params) static int bsp_do_flight_plan(struct mp_params *mp_params)
@ -637,7 +637,7 @@ static int mp_init(struct bus *cpu_bus, struct mp_params *p)
/* Start the APs providing number of APs and the cpus_entered field. */ /* Start the APs providing number of APs and the cpus_entered field. */
global_num_aps = p->num_cpus - 1; global_num_aps = p->num_cpus - 1;
if (start_aps(cpu_bus, global_num_aps, ap_count) < 0) { if (start_aps(cpu_bus, global_num_aps, ap_count) != CB_SUCCESS) {
mdelay(1000); mdelay(1000);
printk(BIOS_DEBUG, "%d/%d eventually checked in?\n", printk(BIOS_DEBUG, "%d/%d eventually checked in?\n",
atomic_read(ap_count), global_num_aps); atomic_read(ap_count), global_num_aps);