erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cbfs: load decompressed stage directly to load address

Browse source 
this change makes cbfs able to load a decompressed stage to the load
address without using the cache. this reduces sram footprint in early
boot stages.

BUG=none
TEST=Booted veyron pinky and nyan blaze.
BRANCH=none
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Change-Id: Ie60dbaedfa740b84037e7f059812dc5617ad8502
Reviewed-on: https://chromium-review.googlesource.com/217978
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Daisuke Nojiri 2014-09-12 17:59:42 -07:00 • committed by chrome-internal-fetch
commit 9fd0f879c1
1 changed files with 37 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/lib/cbfs.c
View file

@ -169,38 +169,52 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name)
#else
void * cbfs_load_stage(struct cbfs_media *media, const char *name)
void *cbfs_load_stage(struct cbfs_media *media, const char *name)
{
struct cbfs_stage *stage = (struct cbfs_stage *)
cbfs_get_file_content(media, name, CBFS_TYPE_STAGE);
/* this is a mess. There is no ntohll. */
/* for now, assume compatible byte order until we solve this. */
uintptr_t entry;
struct cbfs_media default_media;
struct cbfs_stage stage;
struct cbfs_file file;
ssize_t offset;
if (stage == NULL)
return (void *) -1;
init_media(&media, &default_media);
offset = cbfs_locate_file(media, &file, name);
if (offset < 0 || file.type != CBFS_TYPE_STAGE)
return (void *)-1;
DEBUG("reading stage header: offset=0x%x len=%d type=%d offset=0x%x\n",
offset, file.len, file.type, file.offset);
if (cbfs_read(media, &stage, offset, sizeof(stage)) != sizeof(stage))
return (void *)-1;
LOG("loading stage %s @ 0x%llx (%d bytes), entry @ 0x%llx\n",
name,
stage->load, stage->memlen,
stage->entry);
stage.load, stage.memlen,
stage.entry);
/* Stages rely the below clearing so that the bss is initialized. */
memset((void *) (uintptr_t) stage->load, 0, stage->memlen);
memset((void *)(uintptr_t)stage.load, 0, stage.memlen);
if (cbfs_decompress(stage->compression,
((unsigned char *) stage) +
sizeof(struct cbfs_stage),
(void *) (uintptr_t) stage->load,
stage->len))
return (void *) -1;
if (stage.compression == CBFS_COMPRESS_NONE) {
if (cbfs_read(media, (void *)(uintptr_t)stage.load,
offset + sizeof(stage), stage.len) != stage.len)
return (void *)-1;
} else {
void *data = media->map(media, offset + sizeof(stage),
stage.len);
if (data == CBFS_MEDIA_INVALID_MAP_ADDRESS) {
ERROR("ERROR: Mapping %s failed.\n", name);
return (void *)-1;
}
if (cbfs_decompress(stage.compression, data,
(void *)(uintptr_t)stage.load, stage.len))
return (void *)-1;
media->unmap(media, data);
}
DEBUG("stage loaded.\n");
DEBUG("stage %s loaded\n", name);
entry = stage->entry;
// entry = ntohll(stage->entry);
return (void *) entry;
return (void *)(uintptr_t)stage.entry;
}
#endif /* CONFIG_RELOCATABLE_RAMSTAGE */