diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2014-02-04 11:43:57 +0000 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2014-03-04 21:40:03 +0000 |
| commit | 6728f8bbe3f9e8c977cb869c8c3cf54ef4676489 (patch) | |
| tree | c6d2e58493cd4efd5f3d2818bb8f87b88fd7811f | |
| parent | b2388490302d41038a5dd9a16d7f6d554c828bd3 (diff) | |
bl_common: add image_size()ryan-issue-42-v2
Fixes ARM-software/tf-issues#42
Some callers of load_image() may need to get the size of the image
before/after loading it.
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
| -rw-r--r-- | common/bl_common.c | 44 | ||||
| -rw-r--r-- | include/bl_common.h | 1 |
2 files changed, 45 insertions, 0 deletions
diff --git a/common/bl_common.c b/common/bl_common.c index 9afae95..da027b6 100644 --- a/common/bl_common.c +++ b/common/bl_common.c @@ -251,6 +251,50 @@ static void dump_load_info(unsigned long image_load_addr, #endif } +/* Generic function to return the size of an image */ +unsigned long image_size(const char *image_name) +{ + io_dev_handle dev_handle; + io_handle image_handle; + void *image_spec; + size_t image_size = 0; + int io_result = IO_FAIL; + + assert(image_name != NULL); + + /* Obtain a reference to the image by querying the platform layer */ + io_result = plat_get_image_source(image_name, &dev_handle, &image_spec); + if (io_result != IO_SUCCESS) { + WARN("Failed to obtain reference to image '%s' (%i)\n", + image_name, io_result); + return 0; + } + + /* Attempt to access the image */ + io_result = io_open(dev_handle, image_spec, &image_handle); + if (io_result != IO_SUCCESS) { + WARN("Failed to access image '%s' (%i)\n", + image_name, io_result); + return 0; + } + + /* Find the size of the image */ + io_result = io_size(image_handle, &image_size); + if ((io_result != IO_SUCCESS) || (image_size == 0)) { + WARN("Failed to determine the size of the image '%s' file (%i)\n", + image_name, io_result); + } + io_result = io_close(image_handle); + /* Ignore improbable/unrecoverable error in 'close' */ + + /* TODO: Consider maintaining open device connection from this + * bootloader stage + */ + io_result = io_dev_close(dev_handle); + /* Ignore improbable/unrecoverable error in 'dev_close' */ + + return image_size; +} /******************************************************************************* * Generic function to load an image into the trusted RAM, * given a name, extents of free memory & whether the image should be loaded at diff --git a/include/bl_common.h b/include/bl_common.h index aad3d22..81c6b41 100644 --- a/include/bl_common.h +++ b/include/bl_common.h @@ -133,6 +133,7 @@ extern void init_bl2_mem_layout(meminfo *, extern void init_bl31_mem_layout(const meminfo *, meminfo *, unsigned int) __attribute__((weak)); +extern unsigned long image_size(const char *); extern unsigned long load_image(meminfo *, const char *, unsigned int, unsigned long); extern void __dead2 run_image(unsigned long entrypoint, unsigned long spsr, |