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

CBMEM: Always use DYNAMIC_CBMEM

Browse Source 
Drop the implementation of statically allocated high memory
region for CBMEM. There is no longer the need to explicitly
select DYNAMIC_CBMEM, it is the only remaining choice.

Change-Id: Iadf6f27a134e05daa1038646d0b4e0b8f9f0587a
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7851
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@google.com>
This commit is contained in:
Kyösti Mälkki
2014-11-28 11:24:19 +02:00
parent 2fb6b40ed0
commit ae98e83eb2
30 changed files with 7 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,21 +26,6 @@
#include <console/cbmem_console.h>
#include <timestamp.h>
#if !CONFIG_DYNAMIC_CBMEM
void get_cbmem_table(uint64_t *base, uint64_t *size)
{
uint64_t top_of_ram = get_top_of_ram();
if (top_of_ram >= HIGH_MEMORY_SIZE) {
*base = top_of_ram - HIGH_MEMORY_SIZE;
*size = HIGH_MEMORY_SIZE;
} else {
*base = 0;
*size = 0;
}
}
#endif /* !DYNAMIC_CBMEM */
#if IS_ENABLED(CONFIG_LATE_CBMEM_INIT)
#if !defined(__PRE_RAM__)
@@ -52,11 +37,7 @@ void __attribute__((weak)) backup_top_of_ram(uint64_t ramtop)
void set_top_of_ram(uint64_t ramtop)
{
backup_top_of_ram(ramtop);
#if !CONFIG_DYNAMIC_CBMEM
cbmem_late_set_table(ramtop - HIGH_MEMORY_SIZE, HIGH_MEMORY_SIZE);
#else
cbmem_set_top((void*)(uintptr_t)ramtop);
#endif
}
#endif /* !__PRE_RAM__ */
@@ -66,13 +47,11 @@ unsigned long __attribute__((weak)) get_top_of_ram(void)
return 0;
}
#if IS_ENABLED(CONFIG_DYNAMIC_CBMEM)
void *cbmem_top(void)
{
/* Top of cbmem is at lowest usable DRAM address below 4GiB. */
return (void *)get_top_of_ram();
}
#endif
#endif /* LATE_CBMEM_INIT */

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

@@ -101,11 +101,8 @@ void write_tables(void)
#endif /* CONFIG_GENERATE_MP_TABLE */
#if CONFIG_HAVE_ACPI_TABLES
#if CONFIG_DYNAMIC_CBMEM
#define MAX_ACPI_SIZE (144 * 1024)
#else
#define MAX_ACPI_SIZE (45 * 1024)
#endif
post_code(0x9c);
/* Write ACPI tables to F segment and high tables area */
@@ -199,11 +196,7 @@ void write_tables(void)
/* FIXME: The high_table_base parameter is not reference when tables are high,
* or high_table_pointer >1 MB.
*/
#if CONFIG_DYNAMIC_CBMEM
u64 fixme_high_tables_base = 0;
#else
u64 fixme_high_tables_base = (u32)get_cbmem_toc();
#endif
/* Also put a forwarder entry into 0-4K */
new_high_table_pointer = write_coreboot_table(low_table_start, low_table_end,