Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37363 )
Change subject: lib/imd_cbmem: Rename imd_cbmem into imd, use directly ......................................................................
lib/imd_cbmem: Rename imd_cbmem into imd, use directly
Change-Id: I70e9d9f769831087becbf42dcfb774d8f2638770 Signed-off-by: Patrick Georgi pgeorgi@google.com --- M src/lib/imd_cbmem.c 1 file changed, 12 insertions(+), 26 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/63/37363/1
diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c index c3204e2..3dc9058 100644 --- a/src/lib/imd_cbmem.c +++ b/src/lib/imd_cbmem.c @@ -27,6 +27,8 @@ has to fill in the _cbmem_top_ptr symbol based on the calling arguments. */ uintptr_t _cbmem_top_ptr;
+static struct imd imd; + void *cbmem_top(void) { if (ENV_ROMSTAGE) { @@ -42,9 +44,6 @@ dead_code(); }
- -static struct imd imd_cbmem; - static inline const struct cbmem_entry *imd_to_cbmem(const struct imd_entry *e) { return (const struct cbmem_entry *)e; @@ -74,12 +73,11 @@
void cbmem_initialize_empty_id_size(u32 id, u64 size) { - struct imd *imd = &imd_cbmem; const int no_recovery = 0;
cbmem_top_init_once();
- imd_handle_init(imd, cbmem_top()); + imd_handle_init(&imd, cbmem_top());
printk(BIOS_DEBUG, "CBMEM:\n");
@@ -104,12 +102,11 @@
int cbmem_initialize_id_size(u32 id, u64 size) { - struct imd *imd = &imd_cbmem; const int recovery = 1;
cbmem_top_init_once();
- imd_handle_init(imd, cbmem_top()); + imd_handle_init(&imd, cbmem_top());
if (imd_recover(imd)) return 1; @@ -145,20 +142,18 @@
const struct cbmem_entry *cbmem_entry_add(u32 id, u64 size64) { - struct imd *imd = &imd_cbmem; const struct imd_entry *e;
- e = imd_entry_find_or_add(imd, id, size64); + e = imd_entry_find_or_add(&imd, id, size64);
return imd_to_cbmem(e); }
void *cbmem_add(u32 id, u64 size) { - struct imd *imd = &imd_cbmem; const struct imd_entry *e;
- e = imd_entry_find_or_add(imd, id, size); + e = imd_entry_find_or_add(&imd, id, size);
if (e == NULL) return NULL; @@ -169,20 +164,18 @@ /* Retrieve a region provided a given id. */ const struct cbmem_entry *cbmem_entry_find(u32 id) { - struct imd *imd = &imd_cbmem; const struct imd_entry *e;
- e = imd_entry_find(imd, id); + e = imd_entry_find(&imd, id);
return imd_to_cbmem(e); }
void *cbmem_find(u32 id) { - struct imd *imd = &imd_cbmem; const struct imd_entry *e;
- e = imd_entry_find(imd, id); + e = imd_entry_find(&imd, id);
if (e == NULL) return NULL; @@ -194,23 +187,17 @@ * cannot be removed unless it was the last one added. */ int cbmem_entry_remove(const struct cbmem_entry *entry) { - struct imd *imd = &imd_cbmem; - - return imd_entry_remove(imd, cbmem_to_imd(entry)); + return imd_entry_remove(&imd, cbmem_to_imd(entry)); }
u64 cbmem_entry_size(const struct cbmem_entry *entry) { - struct imd *imd = &imd_cbmem; - - return imd_entry_size(imd, cbmem_to_imd(entry)); + return imd_entry_size(&imd, cbmem_to_imd(entry)); }
void *cbmem_entry_start(const struct cbmem_entry *entry) { - struct imd *imd = &imd_cbmem; - - return imd_entry_at(imd, cbmem_to_imd(entry)); + return imd_entry_at(&imd, cbmem_to_imd(entry)); }
void cbmem_add_bootmem(void) @@ -237,9 +224,8 @@ void cbmem_list(void) { static const struct imd_lookup lookup[] = { CBMEM_ID_TO_NAME_TABLE }; - struct imd *imd = &imd_cbmem;
- imd_print_entries(imd, lookup, ARRAY_SIZE(lookup)); + imd_print_entries(&imd, lookup, ARRAY_SIZE(lookup)); } #endif