summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/x86/boot/cbmem.c1
-rw-r--r--src/include/cbmem.h30
-rw-r--r--src/lib/cbmem.c9
3 files changed, 23 insertions, 17 deletions
diff --git a/src/arch/x86/boot/cbmem.c b/src/arch/x86/boot/cbmem.c
index 01520187f9..c2d9a2ed87 100644
--- a/src/arch/x86/boot/cbmem.c
+++ b/src/arch/x86/boot/cbmem.c
@@ -15,6 +15,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
*/
+#include <stdlib.h>
#include <console/console.h>
#include <cbmem.h>
#include <arch/acpi.h>
diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index 746f40cbcf..5f1ac3c581 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -21,13 +21,6 @@
#ifndef _CBMEM_H_
#define _CBMEM_H_
-/* Reserve 128k for ACPI and other tables */
-#if CONFIG_CONSOLE_CBMEM
-#define HIGH_MEMORY_DEF_SIZE ( 256 * 1024 )
-#else
-#define HIGH_MEMORY_DEF_SIZE ( 128 * 1024 )
-#endif
-
#if CONFIG_HAVE_ACPI_RESUME
#if CONFIG_RELOCATABLE_RAMSTAGE
#define HIGH_MEMORY_SAVE 0
@@ -35,16 +28,11 @@
#define HIGH_MEMORY_SAVE (CONFIG_RAMTOP - CONFIG_RAMBASE)
#endif
-#define HIGH_MEMORY_SIZE (HIGH_MEMORY_SAVE + CONFIG_HIGH_SCRATCH_MEMORY_SIZE + HIGH_MEMORY_DEF_SIZE)
-
/* Delegation of resume backup memory so we don't have to
* (slowly) handle backing up OS memory in romstage.c
*/
#define CBMEM_BOOT_MODE 0x610
#define CBMEM_RESUME_BACKUP 0x614
-
-#else /* CONFIG_HAVE_ACPI_RESUME */
-#define HIGH_MEMORY_SIZE HIGH_MEMORY_DEF_SIZE
#endif /* CONFIG_HAVE_ACPI_RESUME */
#define CBMEM_ID_FREESPACE 0x46524545
@@ -130,6 +118,24 @@ u64 cbmem_entry_size(const struct cbmem_entry *entry);
#else /* !CONFIG_DYNAMIC_CBMEM */
+/* Allocation with static CBMEM is resolved at build time. We start
+ * with 128kB and conditionally add some of the most greedy CBMEM
+ * table entries.
+ */
+#define _CBMEM_SZ_MINIMAL ( 128 * 1024 )
+
+#if CONFIG_HAVE_ACPI_RESUME
+#define _CBMEM_SZ_RESUME (HIGH_MEMORY_SAVE + CONFIG_HIGH_SCRATCH_MEMORY_SIZE)
+#else
+#define _CBMEM_SZ_RESUME 0
+#endif
+
+#define _CBMEM_SZ_TOTAL \
+ (_CBMEM_SZ_MINIMAL + _CBMEM_SZ_RESUME + CONFIG_CONSOLE_CBMEM_BUFFER_SIZE)
+
+#define HIGH_MEMORY_SIZE ALIGN_UP(_CBMEM_SZ_TOTAL, 0x10000)
+
+
#ifndef __PRE_RAM__
void set_top_of_ram(uint64_t ramtop);
void backup_top_of_ram(uint64_t ramtop);
diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c
index 6b0cbc8948..6cdf7721c9 100644
--- a/src/lib/cbmem.c
+++ b/src/lib/cbmem.c
@@ -104,13 +104,12 @@ static void cbmem_init(void)
cbmem_locate_table(&baseaddr, &size);
cbmem_trace_location(baseaddr, size, __FUNCTION__);
- cbmem_toc = (struct cbmem_entry *)(unsigned long)baseaddr;
-
- if (size < (64 * 1024)) {
- printk(BIOS_DEBUG, "Increase CBMEM size!\n");
- for (;;) ;
+ if (!(baseaddr && size)) {
+ printk(BIOS_CRIT, "Unable to set location for CBMEM.\n");
+ return;
}
+ cbmem_toc = (struct cbmem_entry *)(unsigned long)baseaddr;
memset(cbmem_toc, 0, CBMEM_TOC_RESERVED);
cbmem_toc[0] = (struct cbmem_entry) {