mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-05-01 16:13:16 +00:00
843ddee4aa
This patch fixes inconsistencies in bl1_tbbr_image_descs[]
and miscellaneous fixes in Firmware Update code.
Following are the changes:
* As part of the original FWU changes, a `copied_size`
field was added to `image_info_t`. This was a subtle binary
compatibility break because it changed the size of the
`bl31_params_t` struct, which could cause problems if
somebody used different versions of BL2 or BL31, one with
the old `image_info_t` and one with the new version.
This patch put the `copied_size` within the `image_desc_t`.
* EXECUTABLE flag is now stored in `ep_info.h.attr` in place
of `image_info.h.attr`, associating it to an entrypoint.
* The `image_info.image_base` is only relevant for secure
images that are copied from non-secure memory into secure
memory. This patch removes initializing `image_base` for
non secure images in the bl1_tbbr_image_descs[].
* A new macro `SET_STATIC_PARAM_HEAD` is added for populating
bl1_tbbr_image_descs[].ep_info/image_info.h members statically.
The version, image_type and image attributes are now
populated using this new macro.
* Added PLAT_ARM_NVM_BASE and PLAT_ARM_NVM_SIZE to avoid direct
usage of V2M_FLASH0_XXX in plat/arm/common/arm_bl1_fwu.c.
* Refactoring of code/macros related to SECURE and EXECUTABLE flags.
NOTE: PLATFORM PORTS THAT RELY ON THE SIZE OF `image_info_t`
OR USE the "EXECUTABLE" BIT WITHIN `image_info_t.h.attr`
OR USE THEIR OWN `image_desc_t` ARRAY IN BL1, MAY BE
BROKEN BY THIS CHANGE. THIS IS CONSIDERED UNLIKELY.
Change-Id: Id4e5989af7bf0ed263d19d3751939da1169b561d
115 lines
3.2 KiB
C
115 lines
3.2 KiB
C
/*
|
|
* Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* Redistributions of source code must retain the above copyright notice, this
|
|
* list of conditions and the following disclaimer.
|
|
*
|
|
* Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
*
|
|
* Neither the name of ARM nor the names of its contributors may be used
|
|
* to endorse or promote products derived from this software without specific
|
|
* prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <assert.h>
|
|
#include <bl_common.h>
|
|
#include <debug.h>
|
|
#include <errno.h>
|
|
#include <plat_arm.h>
|
|
#include <platform_def.h>
|
|
#include <tbbr_img_desc.h>
|
|
|
|
|
|
/* Struct to keep track of usable memory */
|
|
typedef struct bl1_mem_info {
|
|
uintptr_t mem_base;
|
|
unsigned int mem_size;
|
|
} bl1_mem_info_t;
|
|
|
|
bl1_mem_info_t fwu_addr_map_secure[] = {
|
|
{
|
|
.mem_base = ARM_SHARED_RAM_BASE,
|
|
.mem_size = ARM_SHARED_RAM_SIZE
|
|
},
|
|
{
|
|
.mem_size = 0
|
|
}
|
|
};
|
|
|
|
bl1_mem_info_t fwu_addr_map_non_secure[] = {
|
|
{
|
|
.mem_base = ARM_NS_DRAM1_BASE,
|
|
.mem_size = ARM_NS_DRAM1_SIZE
|
|
},
|
|
{
|
|
.mem_base = PLAT_ARM_NVM_BASE,
|
|
.mem_size = PLAT_ARM_NVM_SIZE
|
|
},
|
|
{
|
|
.mem_size = 0
|
|
}
|
|
};
|
|
|
|
int bl1_plat_mem_check(uintptr_t mem_base,
|
|
unsigned int mem_size,
|
|
unsigned int flags)
|
|
{
|
|
unsigned int index = 0;
|
|
bl1_mem_info_t *mmap;
|
|
|
|
assert(mem_base);
|
|
assert(mem_size);
|
|
|
|
/*
|
|
* Check the given image source and size.
|
|
*/
|
|
if (GET_SECURITY_STATE(flags) == SECURE)
|
|
mmap = fwu_addr_map_secure;
|
|
else
|
|
mmap = fwu_addr_map_non_secure;
|
|
|
|
while (mmap[index].mem_size) {
|
|
if ((mem_base >= mmap[index].mem_base) &&
|
|
((mem_base + mem_size)
|
|
<= (mmap[index].mem_base +
|
|
mmap[index].mem_size)))
|
|
return 0;
|
|
|
|
index++;
|
|
}
|
|
|
|
return -ENOMEM;
|
|
}
|
|
|
|
/*******************************************************************************
|
|
* This function does linear search for image_id and returns image_desc.
|
|
******************************************************************************/
|
|
image_desc_t *bl1_plat_get_image_desc(unsigned int image_id)
|
|
{
|
|
unsigned int index = 0;
|
|
|
|
while (bl1_tbbr_image_descs[index].image_id != INVALID_IMAGE_ID) {
|
|
if (bl1_tbbr_image_descs[index].image_id == image_id)
|
|
return &bl1_tbbr_image_descs[index];
|
|
index++;
|
|
}
|
|
|
|
return NULL;
|
|
}
|