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

cpu/x86/mp_init.c: Use existing code to create cpu struct device 

Change-Id: I80baadd405b31d6be2fdbb894b0f4b7c775da6f8
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/64341
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jonathan Zhang <jonzhang@fb.com>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Arthur Heymans 2022-05-14 01:23:22 +02:00 committed by Felix Held
parent 6b8c06dc39
commit 27802bb7b2
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,18 +369,9 @@ static int allocate_cpu_devices(struct bus *cpu_bus, struct mp_params *p)
info = cpu_info(); info = cpu_info();
for (i = 1; i < max_cpus; i++) { for (i = 1; i < max_cpus; i++) {
struct device_path cpu_path;
struct device *new;
/* Build the CPU device path */
cpu_path.type = DEVICE_PATH_APIC;
/* Assuming linear APIC space allocation. AP will set its own /* Assuming linear APIC space allocation. AP will set its own
APIC id in the ap_init() path above. */ APIC id in the ap_init() path above. */
cpu_path.apic.apic_id = info->cpu->path.apic.apic_id + i; struct device *new = add_cpu_device(cpu_bus, info->cpu->path.apic.apic_id + i, 1);
/* Allocate the new CPU device structure */
new = alloc_find_dev(cpu_bus, &cpu_path);
if (new == NULL) { if (new == NULL) {
printk(BIOS_CRIT, "Could not allocate CPU device\n"); printk(BIOS_CRIT, "Could not allocate CPU device\n");
max_cpus--; max_cpus--;
@ -532,7 +523,6 @@ static enum cb_err bsp_do_flight_plan(struct mp_params *mp_params)
static enum cb_err init_bsp(struct bus *cpu_bus) static enum cb_err init_bsp(struct bus *cpu_bus)
{ {
struct device_path cpu_path;
struct cpu_info *info; struct cpu_info *info;
/* Print processor name */ /* Print processor name */
@ -543,13 +533,15 @@ static enum cb_err init_bsp(struct bus *cpu_bus)
enable_lapic(); enable_lapic();
setup_lapic_interrupts(); setup_lapic_interrupts();
/* Set the device path of the boot CPU. */ struct device *bsp = add_cpu_device(cpu_bus, lapicid(), 1);
cpu_path.type = DEVICE_PATH_APIC; if (bsp == NULL) {
cpu_path.apic.apic_id = lapicid(); printk(BIOS_CRIT, "Failed to find or allocate BSP struct device\n");
return CB_ERR;
}
/* Find the device structure for the boot CPU. */ /* Find the device structure for the boot CPU. */
info = cpu_info(); info = cpu_info();
info->cpu = alloc_find_dev(cpu_bus, &cpu_path); info->cpu = bsp;
info->cpu->name = processor_name; info->cpu->name = processor_name;
if (info->index != 0) { if (info->index != 0) {