summaryrefslogtreecommitdiff
path: root/src/arch/x86/cbmem.c
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2018-06-03 12:29:50 +0300
committerPatrick Georgi <pgeorgi@google.com>2018-12-22 11:48:37 +0000
commit513a1a81f778b9fddbb55a36a38b2dd855215327 (patch)
treedd63ac840d855d65222f988e8dc1d8e5fa136df7 /src/arch/x86/cbmem.c
parent8616442150f6a4777ccad9c5b29b8bbfa4be5067 (diff)
downloadcoreboot-513a1a81f778b9fddbb55a36a38b2dd855215327.tar.xz
arch/x86 cbmem: Drop tests for LATE_CBMEM_INIT
Remove all cases in code where we tested for EARLY_CBMEM_INIT or LATE_CBMEM_INIT being set. This also removes all references to LATE_CBMEM_INIT in comments. Change-Id: I4e47fb5c8a947d268f4840cfb9c0d3596fb9ab39 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/26827 Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/arch/x86/cbmem.c')
-rw-r--r--src/arch/x86/cbmem.c44
1 files changed, 6 insertions, 38 deletions
diff --git a/src/arch/x86/cbmem.c b/src/arch/x86/cbmem.c
index b3d89f4953..73967e17f8 100644
--- a/src/arch/x86/cbmem.c
+++ b/src/arch/x86/cbmem.c
@@ -15,55 +15,23 @@
#include <cbmem.h>
#include <arch/acpi.h>
-#if IS_ENABLED(CONFIG_LATE_CBMEM_INIT)
-
-void __weak backup_top_of_low_cacheable(uintptr_t ramtop)
-{
- /* Do nothing. Chipset may have implementation to save ramtop in NVRAM.
- */
-}
-
-uintptr_t __weak restore_top_of_low_cacheable(void)
-{
- return 0;
-}
-
-#endif /* LATE_CBMEM_INIT */
-
#if IS_ENABLED(CONFIG_CBMEM_TOP_BACKUP)
-static void *cbmem_top_backup;
-
-void set_late_cbmem_top(uintptr_t ramtop)
-{
- backup_top_of_low_cacheable(ramtop);
- if (ENV_RAMSTAGE)
- cbmem_top_backup = (void *)ramtop;
-}
-
-/* Top of CBMEM is at highest usable DRAM address below 4GiB. */
-uintptr_t __weak restore_cbmem_top(void)
-{
- if (IS_ENABLED(CONFIG_LATE_CBMEM_INIT) && ENV_ROMSTAGE)
- if (!acpi_is_wakeup_s3())
- return 0;
-
- return restore_top_of_low_cacheable();
-}
-
void *cbmem_top(void)
{
- uintptr_t top_backup;
+ static void *cbmem_top_backup;
+ void *top_backup;
if (ENV_RAMSTAGE && cbmem_top_backup != NULL)
return cbmem_top_backup;
- top_backup = restore_cbmem_top();
+ /* Top of CBMEM is at highest usable DRAM address below 4GiB. */
+ top_backup = (void *)restore_top_of_low_cacheable();
if (ENV_RAMSTAGE)
- cbmem_top_backup = (void *)top_backup;
+ cbmem_top_backup = top_backup;
- return (void *)top_backup;
+ return top_backup;
}
#endif /* CBMEM_TOP_BACKUP */