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

AGESA: Drop LATE_CBMEM_INIT in new interface 

Change-Id: Iffa6cf495b4649f73a1095732509f195ac828248
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/21379
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Kyösti Mälkki 2017-09-02 17:25:21 +03:00
parent 7076aa5745
commit ef40c0ce91
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cpu/amd/agesa/romstage.c
View File

@ -30,6 +30,10 @@
#include <northbridge/amd/agesa/agesa_helper.h> #include <northbridge/amd/agesa/agesa_helper.h>
#include <northbridge/amd/agesa/state_machine.h> #include <northbridge/amd/agesa/state_machine.h>
#if IS_ENABLED(CONFIG_LATE_CBMEM_INIT)
#error "Only EARLY_CBMEM_INIT is supported."
#endif
void asmlinkage early_all_cores(void) void asmlinkage early_all_cores(void)
{ {
amd_initmmio(); amd_initmmio();
@ -54,7 +58,6 @@ void * asmlinkage romstage_main(unsigned long bist)
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); u8 initial_apic_id = (u8) (cpuid_ebx(1) >> 24);
uintptr_t stack_top = CACHE_TMP_RAMTOP;
int cbmem_initted = 0; int cbmem_initted = 0;
fill_sysinfo(cb); fill_sysinfo(cb);
@ -98,7 +101,6 @@ void * asmlinkage romstage_main(unsigned long bist)
} }
if (IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) || cb->s3resume)
cbmem_initted = !cbmem_recovery(cb->s3resume); cbmem_initted = !cbmem_recovery(cb->s3resume);
if (cb->s3resume && !cbmem_initted) { if (cb->s3resume && !cbmem_initted) {
@ -106,13 +108,10 @@ void * asmlinkage romstage_main(unsigned long bist)
halt(); halt();
} }
if (IS_ENABLED(CONFIG_EARLY_CBMEM_INIT) || cb->s3resume) { uintptr_t stack_top = romstage_ram_stack_base(HIGH_ROMSTAGE_STACK_SIZE,
stack_top = romstage_ram_stack_base(HIGH_ROMSTAGE_STACK_SIZE,
ROMSTAGE_STACK_CBMEM); ROMSTAGE_STACK_CBMEM);
stack_top += HIGH_ROMSTAGE_STACK_SIZE; stack_top += HIGH_ROMSTAGE_STACK_SIZE;
}
if (IS_ENABLED(CONFIG_EARLY_CBMEM_INIT))
romstage_handoff_init(cb->s3resume); romstage_handoff_init(cb->s3resume);
printk(BIOS_DEBUG, "Move CAR stack.\n"); printk(BIOS_DEBUG, "Move CAR stack.\n");

3
src/northbridge/amd/agesa/state_machine.c
View File

@ -326,9 +326,6 @@ static void amd_bs_ramstage_init(void *arg)
if (!acpi_is_wakeup_s3()) if (!acpi_is_wakeup_s3())
agesa_execute_state(cb, AMD_INIT_ENV); agesa_execute_state(cb, AMD_INIT_ENV);
else { else {
/* We need HEAP from CBMEM early. */
if (IS_ENABLED(CONFIG_LATE_CBMEM_INIT))
cbmem_initialize();
agesa_execute_state(cb, AMD_S3LATE_RESTORE); agesa_execute_state(cb, AMD_S3LATE_RESTORE);
fchs3earlyrestore(&cb->StdHeader); fchs3earlyrestore(&cb->StdHeader);
} }