[coreboot-gerrit] Patch set updated for coreboot: d45aa25 cbmem: swith over to imd-based cbmem
Aaron Durbin (adurbin@google.com)
gerrit at coreboot.org
Tue Mar 31 00:09:21 CEST 2015
Aaron Durbin (adurbin at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9169
-gerrit
commit d45aa25af287057d22253a1a68265e7c07c00c6e
Author: Aaron Durbin <adurbin at chromium.org>
Date: Mon Mar 30 16:34:20 2015 -0500
cbmem: swith over to imd-based cbmem
In order to reduce the number of cbmem implementations remove
the dynamic cbmem with the imd-based one. The imd library
still provdes dynamic growth so that feature hasn't changed.
The current imd-based cbmem packs small allocations into a larger
entry.
Side note: this CL provides a basis for what hoops one needs to
jump through when there are not writeable global variables on
a particular platform in the early stages.
Change-Id: If770246caa64b274819e45a26e100b62b9f8d2db
Signed-off-by: Aaron Durbin <adurbin at chromium.org>
---
src/lib/Makefile.inc | 6 +-
src/lib/dynamic_cbmem.c | 481 ------------------------------------------------
src/lib/imd_cbmem.c | 78 ++++++--
3 files changed, 67 insertions(+), 498 deletions(-)
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 33c3e72..2d7f500 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -90,12 +90,10 @@ ramstage-$(CONFIG_TIMER_QUEUE) += timer_queue.c
ramstage-$(CONFIG_TERTIARY_BOARD_ID) += tristate_gpios.c
romstage-y += cbmem_common.c
-romstage-$(CONFIG_PLATFORM_NO_EARLY_WRITABLE_GLOBALS) += dynamic_cbmem.c
-romstage-$(CONFIG_PLATFORM_HAS_EARLY_WRITABLE_GLOBALS) += imd_cbmem.c
+romstage-y += imd_cbmem.c
ramstage-y += cbmem_common.c
-ramstage-$(CONFIG_PLATFORM_NO_EARLY_WRITABLE_GLOBALS) += dynamic_cbmem.c
-ramstage-$(CONFIG_PLATFORM_HAS_EARLY_WRITABLE_GLOBALS) += imd_cbmem.c
+ramstage-y += imd_cbmem.c
romstage-y += imd.c
ramstage-y += imd.c
diff --git a/src/lib/dynamic_cbmem.c b/src/lib/dynamic_cbmem.c
deleted file mode 100644
index cff8f7d..0000000
--- a/src/lib/dynamic_cbmem.c
+++ /dev/null
@@ -1,481 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2013 Google, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <bootstate.h>
-#include <bootmem.h>
-#include <console/console.h>
-#include <cbmem.h>
-#include <string.h>
-#include <stdlib.h>
-#include <arch/early_variables.h>
-#ifndef UINT_MAX
-#define UINT_MAX 4294967295U
-#endif
-
-/*
- * The dynamic cbmem code uses a root region. The root region boundary
- * addresses are determined by cbmem_top() and ROOT_MIN_SIZE. Just below
- * the address returned by cbmem_top() is a pointer that points to the
- * root data structure. The root data structure provides the book keeping
- * for each large entry.
- */
-
-/* The root region is at least DYN_CBMEM_ALIGN_SIZE . */
-#define ROOT_MIN_SIZE DYN_CBMEM_ALIGN_SIZE
-#define CBMEM_POINTER_MAGIC 0xc0389479
-#define CBMEM_ENTRY_MAGIC ~(CBMEM_POINTER_MAGIC)
-
-/* The cbmem_root_pointer structure lives just below address returned
- * from cbmem_top(). It points to the root data structure that
- * maintains the entries. */
-struct cbmem_root_pointer {
- u32 magic;
- u32 root;
-} __attribute__((packed));
-
-struct cbmem_entry {
- u32 magic;
- u32 start;
- u32 size;
- u32 id;
-} __attribute__((packed));
-
-struct cbmem_root {
- u32 max_entries;
- u32 num_entries;
- u32 locked;
- u32 size;
- struct cbmem_entry entries[0];
-} __attribute__((packed));
-
-
-#if !defined(__PRE_RAM__)
-static void *cached_cbmem_top;
-
-void cbmem_set_top(void * ramtop)
-{
- cached_cbmem_top = ramtop;
-}
-#endif
-
-static inline void *cbmem_top_cached(void)
-{
-#if !defined(__PRE_RAM__)
- if (cached_cbmem_top == NULL)
- cached_cbmem_top = cbmem_top();
-
- return cached_cbmem_top;
-#else
- return cbmem_top();
-#endif
-}
-
-static inline uintptr_t get_top_aligned(void)
-{
- uintptr_t top;
-
- /* Align down what is returned from cbmem_top(). */
- top = (uintptr_t)cbmem_top_cached();
- top &= ~(DYN_CBMEM_ALIGN_SIZE - 1);
-
- return top;
-}
-
-static inline void *get_root(void)
-{
- uintptr_t pointer_addr;
- struct cbmem_root_pointer *pointer;
-
- pointer_addr = get_top_aligned();
- if (pointer_addr == 0)
- return NULL;
-
- pointer_addr -= sizeof(struct cbmem_root_pointer);
-
- pointer = (void *)pointer_addr;
- if (pointer->magic != CBMEM_POINTER_MAGIC)
- return NULL;
-
- pointer_addr = pointer->root;
- return (void *)pointer_addr;
-}
-
-static inline void cbmem_entry_assign(struct cbmem_entry *entry,
- u32 id, u32 start, u32 size)
-{
- entry->magic = CBMEM_ENTRY_MAGIC;
- entry->start = start;
- entry->size = size;
- entry->id = id;
-}
-
-static inline const struct cbmem_entry *
-cbmem_entry_append(struct cbmem_root *root, u32 id, u32 start, u32 size)
-{
- struct cbmem_entry *cbmem_entry;
-
- cbmem_entry = &root->entries[root->num_entries];
- root->num_entries++;
-
- cbmem_entry_assign(cbmem_entry, id, start, size);
-
- return cbmem_entry;
-}
-
-void cbmem_initialize_empty(void)
-{
- uintptr_t pointer_addr;
- uintptr_t root_addr;
- unsigned long max_entries;
- struct cbmem_root *root;
- struct cbmem_root_pointer *pointer;
-
- /* Place the root pointer and the root. The number of entries is
- * dictated by difference between the root address and the pointer
- * where the root address is aligned down to
- * DYN_CBMEM_ALIGN_SIZE. The pointer falls just below the
- * address returned by get_top_aligned(). */
- pointer_addr = get_top_aligned();
- if (pointer_addr == 0)
- return;
-
- root_addr = pointer_addr - ROOT_MIN_SIZE;
- root_addr &= ~(DYN_CBMEM_ALIGN_SIZE - 1);
- pointer_addr -= sizeof(struct cbmem_root_pointer);
-
- max_entries = (pointer_addr - (root_addr + sizeof(*root))) /
- sizeof(struct cbmem_entry);
-
- pointer = (void *)pointer_addr;
- pointer->magic = CBMEM_POINTER_MAGIC;
- pointer->root = root_addr;
-
- root = (void *)root_addr;
- root->max_entries = max_entries;
- root->num_entries = 0;
- root->locked = 0;
- root->size = pointer_addr - root_addr +
- sizeof(struct cbmem_root_pointer);
-
- /* Add an entry covering the root region. */
- cbmem_entry_append(root, CBMEM_ID_ROOT, root_addr, root->size);
-
- printk(BIOS_DEBUG, "CBMEM: root @ %p %d entries.\n",
- root, root->max_entries);
-
- /* Complete migration to CBMEM. */
- cbmem_run_init_hooks();
-}
-
-static inline int cbmem_fail_recovery(void)
-{
- cbmem_initialize_empty();
- cbmem_fail_resume();
- return 1;
-}
-
-static int validate_entries(struct cbmem_root *root)
-{
- unsigned int i;
- uintptr_t current_end;
-
- current_end = get_top_aligned();
-
- printk(BIOS_DEBUG, "CBMEM: recovering %d/%d entries from root @ %p\n",
- root->num_entries, root->max_entries, root);
-
- /* Check that all regions are properly aligned and are just below
- * the previous entry */
- for (i = 0; i < root->num_entries; i++) {
- struct cbmem_entry *entry = &root->entries[i];
-
- if (entry->magic != CBMEM_ENTRY_MAGIC)
- return -1;
-
- if (entry->start & (DYN_CBMEM_ALIGN_SIZE - 1))
- return -1;
-
- if (entry->start + entry->size != current_end)
- return -1;
-
- current_end = entry->start;
- }
-
- return 0;
-}
-
-int cbmem_initialize(void)
-{
- struct cbmem_root *root;
- uintptr_t top_according_to_root;
-
- root = get_root();
-
- /* No recovery possible since root couldn't be recovered. */
- if (root == NULL)
- return cbmem_fail_recovery();
-
- /* Sanity check the root. */
- top_according_to_root = (root->size + (uintptr_t)root);
- if (get_top_aligned() != top_according_to_root)
- return cbmem_fail_recovery();
-
- if (root->num_entries > root->max_entries)
- return cbmem_fail_recovery();
-
- if ((root->max_entries * sizeof(struct cbmem_entry)) >
- (root->size - sizeof(struct cbmem_root_pointer) - sizeof(*root)))
- return cbmem_fail_recovery();
-
- /* Validate current entries. */
- if (validate_entries(root))
- return cbmem_fail_recovery();
-
-#if defined(__PRE_RAM__)
- /* Lock the root in the romstage on a recovery. The assumption is that
- * recovery is called during romstage on the S3 resume path. */
- root->locked = 1;
-#endif
-
- /* Complete migration to CBMEM. */
- cbmem_run_init_hooks();
-
- /* Recovery successful. */
- return 0;
-}
-
-int cbmem_recovery(int is_wakeup)
-{
- int rv = 0;
- if (!is_wakeup)
- cbmem_initialize_empty();
- else
- rv = cbmem_initialize();
- return rv;
-}
-
-static uintptr_t cbmem_base(void)
-{
- struct cbmem_root *root;
- uintptr_t low_addr;
-
- root = get_root();
-
- if (root == NULL)
- return 0;
-
- low_addr = (uintptr_t)root;
- /* a low address is low. */
- low_addr &= 0xffffffff;
-
- /* Assume the lowest address is the last one added. */
- if (root->num_entries > 0) {
- low_addr = root->entries[root->num_entries - 1].start;
- }
-
- return low_addr;
-}
-
-
-const struct cbmem_entry *cbmem_entry_add(u32 id, u64 size64)
-{
- struct cbmem_root *root;
- const struct cbmem_entry *entry;
- uintptr_t base;
- u32 size;
- u32 aligned_size;
-
- entry = cbmem_entry_find(id);
-
- if (entry != NULL)
- return entry;
-
- /* Only handle sizes <= UINT_MAX internally. */
- if (size64 > (u64)UINT_MAX)
- return NULL;
-
- size = size64;
-
- root = get_root();
-
- if (root == NULL)
- return NULL;
-
- /* Nothing can be added once it is locked down. */
- if (root->locked)
- return NULL;
-
- if (root->max_entries == root->num_entries)
- return NULL;
-
- aligned_size = ALIGN(size, DYN_CBMEM_ALIGN_SIZE);
- base = cbmem_base();
- base -= aligned_size;
-
- return cbmem_entry_append(root, id, base, aligned_size);
-}
-
-void *cbmem_add(u32 id, u64 size)
-{
- const struct cbmem_entry *entry;
-
- entry = cbmem_entry_add(id, size);
-
- if (entry == NULL)
- return NULL;
-
- return cbmem_entry_start(entry);
-}
-
-/* Retrieve a region provided a given id. */
-const struct cbmem_entry *cbmem_entry_find(u32 id)
-{
- struct cbmem_root *root;
- const struct cbmem_entry *entry;
- unsigned int i;
-
- root = get_root();
-
- if (root == NULL)
- return NULL;
-
- entry = NULL;
-
- for (i = 0; i < root->num_entries; i++) {
- if (root->entries[i].id == id) {
- entry = &root->entries[i];
- break;
- }
- }
-
- return entry;
-}
-
-void *cbmem_find(u32 id)
-{
- const struct cbmem_entry *entry;
-
- entry = cbmem_entry_find(id);
-
- if (entry == NULL)
- return NULL;
-
- return cbmem_entry_start(entry);
-}
-
-/* Remove a reserved region. Returns 0 on success, < 0 on error. Note: A region
- * cannot be removed unless it was the last one added. */
-int cbmem_entry_remove(const struct cbmem_entry *entry)
-{
- unsigned long entry_num;
- struct cbmem_root *root;
-
- root = get_root();
-
- if (root == NULL)
- return -1;
-
- if (root->num_entries == 0)
- return -1;
-
- /* Nothing can be removed. */
- if (root->locked)
- return -1;
-
- entry_num = entry - &root->entries[0];
-
- /* If the entry is the last one in the root it can be removed. */
- if (entry_num == (root->num_entries - 1)) {
- root->num_entries--;
- return 0;
- }
-
- return -1;
-}
-
-u64 cbmem_entry_size(const struct cbmem_entry *entry)
-{
- return entry->size;
-}
-
-void *cbmem_entry_start(const struct cbmem_entry *entry)
-{
- uintptr_t addr = entry->start;
- return (void *)addr;
-}
-
-
-#if !defined(__PRE_RAM__)
-
-void cbmem_add_bootmem(void)
-{
- uintptr_t base;
- uintptr_t top;
-
- base = cbmem_base();
- top = get_top_aligned();
- bootmem_add_range(base, top - base, LB_MEM_TABLE);
-}
-
-static const struct {
- u32 id;
- const char *name;
-} cbmem_ids[] = { CBMEM_ID_TO_NAME_TABLE };
-
-static void cbmem_print_entry(int n, u32 id, u64 base, u64 size)
-{
- int i;
- const char *name;
-
- name = NULL;
- for (i = 0; i < ARRAY_SIZE(cbmem_ids); i++) {
- if (cbmem_ids[i].id == id) {
- name = cbmem_ids[i].name;
- break;
- }
- }
-
- if (name == NULL)
- printk(BIOS_DEBUG, "%08x ", id);
- else
- printk(BIOS_DEBUG, "%s", name);
- printk(BIOS_DEBUG, "%2d. ", n);
- printk(BIOS_DEBUG, "%08llx ", base);
- printk(BIOS_DEBUG, "%08llx\n", size);
-}
-
-void cbmem_list(void)
-{
- unsigned int i;
- struct cbmem_root *root;
-
- root = get_root();
-
- if (root == NULL)
- return;
-
- for (i = 0; i < root->num_entries; i++) {
- struct cbmem_entry *entry;
-
- entry = &root->entries[i];
-
- cbmem_print_entry(i, entry->id, entry->start, entry->size);
- }
-}
-#endif /* __PRE_RAM__ */
diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c
index afe4fa2..dec6ab4 100644
--- a/src/lib/imd_cbmem.c
+++ b/src/lib/imd_cbmem.c
@@ -37,12 +37,19 @@
#define SM_ROOT_SIZE 1024
#define SM_ALIGN 32
+#if !defined(__PRE_RAM__) || IS_ENABLED(CONFIG_PLATFORM_HAS_EARLY_WRITABLE_GLOBALS)
static struct imd imd_cbmem CAR_GLOBAL = { };
static inline struct imd *cbmem_get_imd(void)
{
return car_get_var_ptr(&imd_cbmem);
}
+#else
+static inline struct imd *cbmem_get_imd(void)
+{
+ return NULL;
+}
+#endif
#if ENV_RAMSTAGE
void cbmem_set_top(void *ramtop)
@@ -63,14 +70,34 @@ static inline const struct imd_entry *cbmem_to_imd(const struct cbmem_entry *e)
return (const struct imd_entry *)e;
}
-void cbmem_initialize_empty(void)
+static struct imd *imd_init_backing(struct imd *backing)
{
struct imd *imd;
imd = cbmem_get_imd();
+ if (imd != NULL)
+ return imd;
+
+ imd = backing;
imd_handle_init(imd, cbmem_top());
+ if (imd_recover(imd))
+ return NULL;
+
+ return imd;
+}
+
+void cbmem_initialize_empty(void)
+{
+ struct imd *imd;
+ struct imd imd_backing;
+
+ imd = imd_init_backing(&imd_backing);
+
+ if (imd == NULL)
+ return;
+
printk(BIOS_DEBUG, "CBMEM: ");
if (imd_create_tiered_empty(imd, ROOT_MIN_SIZE, LG_ALIGN,
@@ -91,12 +118,11 @@ static inline int cbmem_fail_recovery(void)
int cbmem_initialize(void)
{
struct imd *imd;
+ struct imd imd_backing;
- imd = cbmem_get_imd();
-
- imd_handle_init(imd, cbmem_top());
+ imd = imd_init_backing(&imd_backing);
- if (imd_recover(imd) != 0)
+ if (imd == NULL)
return cbmem_fail_recovery();
#if defined(__PRE_RAM__)
@@ -128,9 +154,13 @@ int cbmem_recovery(int is_wakeup)
const struct cbmem_entry *cbmem_entry_add(u32 id, u64 size64)
{
struct imd *imd;
+ struct imd imd_backing;
const struct imd_entry *e;
- imd = cbmem_get_imd();
+ imd = imd_init_backing(&imd_backing);
+
+ if (imd == NULL)
+ return NULL;
e = imd_entry_find_or_add(imd, id, size64);
@@ -153,9 +183,13 @@ void *cbmem_add(u32 id, u64 size)
const struct cbmem_entry *cbmem_entry_find(u32 id)
{
struct imd *imd;
+ struct imd imd_backing;
const struct imd_entry *e;
- imd = cbmem_get_imd();
+ imd = imd_init_backing(&imd_backing);
+
+ if (imd == NULL)
+ return NULL;
e = imd_entry_find(imd, id);
@@ -178,23 +212,41 @@ void *cbmem_find(u32 id)
* cannot be removed unless it was the last one added. */
int cbmem_entry_remove(const struct cbmem_entry *entry)
{
- const struct imd_entry *e = cbmem_to_imd(entry);
+ struct imd *imd;
+ struct imd imd_backing;
- return imd_entry_remove(cbmem_get_imd(), e);
+ imd = imd_init_backing(&imd_backing);
+
+ if (imd == NULL)
+ return -1;
+
+ return imd_entry_remove(imd, cbmem_to_imd(entry));
}
u64 cbmem_entry_size(const struct cbmem_entry *entry)
{
- const struct imd_entry *e = cbmem_to_imd(entry);
+ struct imd *imd;
+ struct imd imd_backing;
+
+ imd = imd_init_backing(&imd_backing);
+
+ if (imd == NULL)
+ return 0;
- return imd_entry_size(cbmem_get_imd(), e);
+ return imd_entry_size(imd, cbmem_to_imd(entry));
}
void *cbmem_entry_start(const struct cbmem_entry *entry)
{
- const struct imd_entry *e = cbmem_to_imd(entry);
+ struct imd *imd;
+ struct imd imd_backing;
+
+ imd = imd_init_backing(&imd_backing);
+
+ if (imd == NULL)
+ return NULL;
- return imd_entry_at(cbmem_get_imd(), e);
+ return imd_entry_at(imd, cbmem_to_imd(entry));
}
#if !defined(__PRE_RAM__)
More information about the coreboot-gerrit
mailing list