sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CBMEM: Implement cbmem_run_init_hooks() stub

Browse Source 
Until we completely can unify early_variables, use these to
handle CBMEM update hooks for both romstage and ramstage.

For x86, CAR_MIGRATE serves the purpose of romstage hooks.

Change-Id: I100ebc0e35e1b7091b4f287ca37f539fd7c9fa7a
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7876
Reviewed-by: Aaron Durbin <adurbin@google.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Kyösti Mälkki
2014-12-18 18:30:29 +02:00
parent 05369de639
commit 823edda98e
9 changed files with 32 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/arch/arm/tables.c
View File

@@ -29,14 +29,6 @@
#define MAX_COREBOOT_TABLE_SIZE (8 * 1024)
void cbmem_arch_init(void)
{
}
void cbmem_fail_resume(void)
{
}
void write_tables(void)
{
unsigned long table_pointer, new_table_pointer;

8
src/arch/arm64/tables.c
View File

@@ -29,14 +29,6 @@
#define MAX_COREBOOT_TABLE_SIZE (8 * 1024)
void cbmem_arch_init(void)
{
}
void cbmem_fail_resume(void)
{
}
void write_tables(void)
{
unsigned long table_pointer, new_table_pointer;

8
src/arch/riscv/tables.c
View File

@@ -29,10 +29,6 @@
#define MAX_COREBOOT_TABLE_SIZE (8 * 1024)
void cbmem_arch_init(void)
{
}
// WTF. this does not agre with the prototype!
static struct lb_memory *wtf_write_tables(void)
{
@@ -70,7 +66,3 @@ void write_tables(void)
{
wtf_write_tables();
}
void cbmem_fail_resume(void)
{
}

24
src/arch/x86/boot/cbmem.c
View File

@@ -20,6 +20,9 @@
#include <cbmem.h>
#include <arch/acpi.h>
/* FIXME: Remove after CBMEM_INIT_HOOKS. */
#include <cpu/x86/gdt.h>
#if !CONFIG_DYNAMIC_CBMEM
void get_cbmem_table(uint64_t *base, uint64_t *size)
{
@@ -69,16 +72,19 @@ void *cbmem_top(void)
#endif /* DYNAMIC_CBMEM */
#if !defined(__PRE_RAM__)
/* ACPI resume needs to be cleared in the fail-to-recover case, but that
* condition is only handled during ramstage. */
void cbmem_fail_resume(void)
void cbmem_run_init_hooks(void)
{
#if CONFIG_HAVE_ACPI_RESUME
/* Something went wrong, our high memory area got wiped */
acpi_fail_wakeup();
#if !defined(__PRE_RAM__)
move_gdt();
#endif
}
#endif /* !__PRE_RAM__ */
/* Something went wrong, our high memory area got wiped */
void cbmem_fail_resume(void)
{
#if !defined(__PRE_RAM__) && IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
/* ACPI resume needs to be cleared in the fail-to-recover case, but that
* condition is only handled during ramstage. */
acpi_fail_wakeup();
#endif
}

8
src/arch/x86/boot/tables.c
View File

@@ -21,7 +21,6 @@
#include <console/console.h>
#include <cpu/cpu.h>
#include <cpu/x86/gdt.h>
#include <boot/tables.h>
#include <boot/coreboot_tables.h>
#include <arch/pirq_routing.h>
@@ -31,13 +30,6 @@
#include <cbmem.h>
#include <smbios.h>
void cbmem_arch_init(void)
{
/* defined in gdt.c */
move_gdt();
}
void write_tables(void)
{
unsigned long low_table_start, low_table_end;