Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37034 )
Change subject: lib/*_stage_cache.c: drop CAR_GLOBAL_MIGRATION support ......................................................................
lib/*_stage_cache.c: drop CAR_GLOBAL_MIGRATION support
Change-Id: I23d5367150649a64ec6d95601f38940dbb5972f8 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/lib/ext_stage_cache.c 1 file changed, 7 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/37034/1
diff --git a/src/lib/ext_stage_cache.c b/src/lib/ext_stage_cache.c index 354342d..2fc9788 100644 --- a/src/lib/ext_stage_cache.c +++ b/src/lib/ext_stage_cache.c @@ -21,12 +21,7 @@ #include <stage_cache.h> #include <string.h>
-static struct imd imd_stage_cache CAR_GLOBAL = { }; - -static inline struct imd *imd_get(void) -{ - return car_get_var_ptr(&imd_stage_cache); -} +static struct imd imd_stage_cache;
static void stage_cache_create_empty(void) { @@ -34,7 +29,7 @@ void *base; size_t size;
- imd = imd_get(); + imd = &imd_stage_cache; stage_cache_external_region(&base, &size); imd_handle_init(imd, (void *)(size + (uintptr_t)base));
@@ -50,7 +45,7 @@ void *base; size_t size;
- imd = imd_get(); + imd = &imd_stage_cache; stage_cache_external_region(&base, &size); imd_handle_init(imd, (void *)(size + (uintptr_t)base)); if (imd_recover(imd)) @@ -64,7 +59,7 @@ struct stage_cache *meta; void *c;
- imd = imd_get(); + imd = &imd_stage_cache; e = imd_entry_add(imd, CBMEM_ID_STAGEx_META + stage_id, sizeof(*meta));
if (e == NULL) { @@ -99,7 +94,7 @@ const struct imd_entry *e; void *c;
- imd = imd_get(); + imd = &imd_stage_cache; e = imd_entry_add(imd, CBMEM_ID_STAGEx_RAW + stage_id, size); if (e == NULL) { printk(BIOS_DEBUG, "Error: Can't add %x raw data to imd\n", @@ -122,7 +117,7 @@ struct imd *imd; const struct imd_entry *e;
- imd = imd_get(); + imd = &imd_stage_cache; e = imd_entry_find(imd, CBMEM_ID_STAGEx_RAW + stage_id); if (e == NULL) { printk(BIOS_DEBUG, "Error: Can't find %x raw data to imd\n", @@ -142,7 +137,7 @@ void *c; size_t size;
- imd = imd_get(); + imd = &imd_stage_cache; e = imd_entry_find(imd, CBMEM_ID_STAGEx_META + stage_id); if (e == NULL) { printk(BIOS_DEBUG, "Error: Can't find %x metadata in imd\n",
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37034
to look at the new patch set (#2).
Change subject: lib/*_stage_cache.c: drop CAR_GLOBAL_MIGRATION support ......................................................................
lib/*_stage_cache.c: drop CAR_GLOBAL_MIGRATION support
Change-Id: I23d5367150649a64ec6d95601f38940dbb5972f8 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/lib/cbmem_stage_cache.c M src/lib/ext_stage_cache.c 2 files changed, 7 insertions(+), 14 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/37034/2
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37034 )
Change subject: lib/*_stage_cache.c: drop CAR_GLOBAL_MIGRATION support ......................................................................
Patch Set 8: Code-Review+1
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37034 )
Change subject: lib/*_stage_cache.c: drop CAR_GLOBAL_MIGRATION support ......................................................................
Patch Set 8: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37034 )
Change subject: lib/*_stage_cache.c: drop CAR_GLOBAL_MIGRATION support ......................................................................
lib/*_stage_cache.c: drop CAR_GLOBAL_MIGRATION support
Change-Id: I23d5367150649a64ec6d95601f38940dbb5972f8 Signed-off-by: Arthur Heymans arthur@aheymans.xyz Reviewed-on: https://review.coreboot.org/c/coreboot/+/37034 Reviewed-by: HAOUAS Elyes ehaouas@noos.fr Reviewed-by: Kyösti Mälkki kyosti.malkki@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/lib/cbmem_stage_cache.c M src/lib/ext_stage_cache.c 2 files changed, 7 insertions(+), 14 deletions(-)
Approvals: build bot (Jenkins): Verified Kyösti Mälkki: Looks good to me, approved HAOUAS Elyes: Looks good to me, but someone else must approve
diff --git a/src/lib/cbmem_stage_cache.c b/src/lib/cbmem_stage_cache.c index 299cb00..dd56f62 100644 --- a/src/lib/cbmem_stage_cache.c +++ b/src/lib/cbmem_stage_cache.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */
-#include <arch/early_variables.h> #include <cbmem.h> #include <stage_cache.h> #include <string.h> diff --git a/src/lib/ext_stage_cache.c b/src/lib/ext_stage_cache.c index 354342d..466a65f 100644 --- a/src/lib/ext_stage_cache.c +++ b/src/lib/ext_stage_cache.c @@ -13,7 +13,6 @@ * GNU General Public License for more details. */
-#include <arch/early_variables.h> #include <bootstate.h> #include <cbmem.h> #include <console/console.h> @@ -21,12 +20,7 @@ #include <stage_cache.h> #include <string.h>
-static struct imd imd_stage_cache CAR_GLOBAL = { }; - -static inline struct imd *imd_get(void) -{ - return car_get_var_ptr(&imd_stage_cache); -} +static struct imd imd_stage_cache;
static void stage_cache_create_empty(void) { @@ -34,7 +28,7 @@ void *base; size_t size;
- imd = imd_get(); + imd = &imd_stage_cache; stage_cache_external_region(&base, &size); imd_handle_init(imd, (void *)(size + (uintptr_t)base));
@@ -50,7 +44,7 @@ void *base; size_t size;
- imd = imd_get(); + imd = &imd_stage_cache; stage_cache_external_region(&base, &size); imd_handle_init(imd, (void *)(size + (uintptr_t)base)); if (imd_recover(imd)) @@ -64,7 +58,7 @@ struct stage_cache *meta; void *c;
- imd = imd_get(); + imd = &imd_stage_cache; e = imd_entry_add(imd, CBMEM_ID_STAGEx_META + stage_id, sizeof(*meta));
if (e == NULL) { @@ -99,7 +93,7 @@ const struct imd_entry *e; void *c;
- imd = imd_get(); + imd = &imd_stage_cache; e = imd_entry_add(imd, CBMEM_ID_STAGEx_RAW + stage_id, size); if (e == NULL) { printk(BIOS_DEBUG, "Error: Can't add %x raw data to imd\n", @@ -122,7 +116,7 @@ struct imd *imd; const struct imd_entry *e;
- imd = imd_get(); + imd = &imd_stage_cache; e = imd_entry_find(imd, CBMEM_ID_STAGEx_RAW + stage_id); if (e == NULL) { printk(BIOS_DEBUG, "Error: Can't find %x raw data to imd\n", @@ -142,7 +136,7 @@ void *c; size_t size;
- imd = imd_get(); + imd = &imd_stage_cache; e = imd_entry_find(imd, CBMEM_ID_STAGEx_META + stage_id); if (e == NULL) { printk(BIOS_DEBUG, "Error: Can't find %x metadata in imd\n",