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

src: Use initial_lapicid() instead of open coding it 

Since initial_lapicid() returns an unsigned int, change the type of the
local variables the return value gets assigned to to unsigned int as
well if applicable. Also change the printk format strings for printing
the variable's contents to %u where it was %d before.

Change-Id: I289015b81b2a9d915c4cab9b0544fc19b85df7a3
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55063
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans 2021-05-29 06:58:38 +02:00 committed by Felix Held
parent 53ea1d44f0
commit 78ab06ace9
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/drivers/amd/agesa/eventlog.c
View File

@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <cpu/x86/lapic.h>
#include <console/console.h> #include <console/console.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
@ -97,7 +98,7 @@ void agesa_state_on_entry(struct agesa_state *task, AGESA_STRUCT_NAME func)
{ {
int i; int i;
task->apic_id = (u8) (cpuid_ebx(1) >> 24); task->apic_id = (u8)initial_lapicid();
task->func = func; task->func = func;
task->function_name = undefined; task->function_name = undefined;

5
src/drivers/amd/agesa/romstage.c
View File

@ -6,6 +6,7 @@
#include <arch/romstage.h> #include <arch/romstage.h>
#include <cbmem.h> #include <cbmem.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/x86/lapic.h>
#include <halt.h> #include <halt.h>
#include <program_loading.h> #include <program_loading.h>
#include <romstage_handoff.h> #include <romstage_handoff.h>
@ -35,7 +36,7 @@ static void romstage_main(void)
struct postcar_frame pcf; struct postcar_frame pcf;
struct sysinfo romstage_state; struct sysinfo romstage_state;
struct sysinfo *cb = &romstage_state; struct sysinfo *cb = &romstage_state;
u8 initial_apic_id = (u8) (cpuid_ebx(1) >> 24); unsigned int initial_apic_id = initial_lapicid();
int cbmem_initted = 0; int cbmem_initted = 0;
fill_sysinfo(cb); fill_sysinfo(cb);
@ -49,7 +50,7 @@ static void romstage_main(void)
console_init(); console_init();
} }
printk(BIOS_DEBUG, "APIC %02d: CPU Family_Model = %08x\n", printk(BIOS_DEBUG, "APIC %02u: CPU Family_Model = %08x\n",
initial_apic_id, cpuid_eax(1)); initial_apic_id, cpuid_eax(1));
set_ap_entry_ptr(ap_romstage_main); set_ap_entry_ptr(ap_romstage_main);

7
src/soc/amd/picasso/mca.c
View File

@ -2,6 +2,7 @@
#include <amdblocks/msr_zen.h> #include <amdblocks/msr_zen.h>
#include <amdblocks/reset.h> #include <amdblocks/reset.h>
#include <cpu/x86/lapic.h>
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <soc/cpu.h> #include <soc/cpu.h>
@ -160,10 +161,8 @@ void check_mca(void)
for (i = 0 ; i < num_banks ; i++) { for (i = 0 ; i < num_banks ; i++) {
mci.sts = rdmsr(MCAX_STATUS_MSR(i)); mci.sts = rdmsr(MCAX_STATUS_MSR(i));
if (mci.sts.hi || mci.sts.lo) { if (mci.sts.hi || mci.sts.lo) {
int core = cpuid_ebx(1) >> 24; printk(BIOS_WARNING, "#MC Error: core %u, bank %d %s\n",
initial_lapicid(), i,
printk(BIOS_WARNING, "#MC Error: core %d, bank %d %s\n",
core, i,
i < ARRAY_SIZE(mca_bank_name) ? mca_bank_name[i] : ""); i < ARRAY_SIZE(mca_bank_name) ? mca_bank_name[i] : "");
printk(BIOS_WARNING, " MC%d_STATUS = %08x_%08x\n", printk(BIOS_WARNING, " MC%d_STATUS = %08x_%08x\n",

7
src/soc/amd/stoneyridge/mca.c
View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <amdblocks/reset.h> #include <amdblocks/reset.h>
#include <cpu/x86/lapic.h>
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <soc/cpu.h> #include <soc/cpu.h>
@ -163,10 +164,8 @@ void check_mca(void)
mci.sts = rdmsr(IA32_MC0_STATUS + (i * 4)); mci.sts = rdmsr(IA32_MC0_STATUS + (i * 4));
if (mci.sts.hi || mci.sts.lo) { if (mci.sts.hi || mci.sts.lo) {
int core = cpuid_ebx(1) >> 24; printk(BIOS_WARNING, "#MC Error: core %u, bank %d %s\n",
initial_lapicid(), i, mca_bank_name[i]);
printk(BIOS_WARNING, "#MC Error: core %d, bank %d %s\n",
core, i, mca_bank_name[i]);
printk(BIOS_WARNING, " MC%d_STATUS = %08x_%08x\n", printk(BIOS_WARNING, " MC%d_STATUS = %08x_%08x\n",
i, mci.sts.hi, mci.sts.lo); i, mci.sts.hi, mci.sts.lo);

5
src/soc/intel/xeon_sp/smmrelocate.c
View File

@ -2,6 +2,7 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <cpu/x86/lapic.h>
#include <cpu/x86/mp.h> #include <cpu/x86/mp.h>
#include <cpu/intel/em64t101_save_state.h> #include <cpu/intel/em64t101_save_state.h>
#include <cpu/intel/smm_reloc.h> #include <cpu/intel/smm_reloc.h>
@ -86,7 +87,6 @@ static void update_save_state(int cpu, uintptr_t curr_smbase,
{ {
u32 smbase; u32 smbase;
u32 iedbase; u32 iedbase;
int apic_id;
em64t101_smm_state_save_area_t *save_state; em64t101_smm_state_save_area_t *save_state;
/* /*
* The relocated handler runs with all CPUs concurrently. Therefore * The relocated handler runs with all CPUs concurrently. Therefore
@ -96,9 +96,8 @@ static void update_save_state(int cpu, uintptr_t curr_smbase,
smbase = staggered_smbase; smbase = staggered_smbase;
iedbase = relo_params->ied_base; iedbase = relo_params->ied_base;
apic_id = cpuid_ebx(1) >> 24;
printk(BIOS_DEBUG, "New SMBASE=0x%08x IEDBASE=0x%08x\n apic_id=0x%x\n", printk(BIOS_DEBUG, "New SMBASE=0x%08x IEDBASE=0x%08x\n apic_id=0x%x\n",
smbase, iedbase, apic_id); smbase, iedbase, initial_lapicid());
save_state = (void *)(curr_smbase + SMM_DEFAULT_SIZE - sizeof(*save_state)); save_state = (void *)(curr_smbase + SMM_DEFAULT_SIZE - sizeof(*save_state));