diff options
author | Manish V Badarkhe <Manish.Badarkhe@arm.com> | 2021-06-25 23:43:33 +0100 |
---|---|---|
committer | Manish V Badarkhe <Manish.Badarkhe@arm.com> | 2021-08-02 17:15:40 +0100 |
commit | 2f1177b2b9ebec3b2fe92607cd771bda1dc9cbfc (patch) | |
tree | 6238a52ba6771873adb0e1f669e538ed60dd0396 /plat | |
parent | 396b339dc20b97ddd75146e03467a255e28f31b9 (diff) | |
download | arm-trusted-firmware-2f1177b2b9ebec3b2fe92607cd771bda1dc9cbfc.tar.gz |
feat(plat/arm): add FWU support in Arm platforms
Added firmware update support in Arm platforms by using
FWU platform hooks and compiling FWU driver in BL2
component.
Change-Id: I71af06c09d95c2c58e3fd766c4a61c5652637151
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
Diffstat (limited to 'plat')
-rw-r--r-- | plat/arm/common/arm_bl2_setup.c | 11 | ||||
-rw-r--r-- | plat/arm/common/arm_common.mk | 12 | ||||
-rw-r--r-- | plat/arm/common/arm_io_storage.c | 104 | ||||
-rw-r--r-- | plat/arm/common/fconf/arm_fconf_io.c | 19 |
4 files changed, 124 insertions, 22 deletions
diff --git a/plat/arm/common/arm_bl2_setup.c b/plat/arm/common/arm_bl2_setup.c index 63ed9fe17..26af38344 100644 --- a/plat/arm/common/arm_bl2_setup.c +++ b/plat/arm/common/arm_bl2_setup.c @@ -94,13 +94,10 @@ void bl2_plat_preload_setup(void) { arm_bl2_dyn_cfg_init(); -#if ARM_GPT_SUPPORT - int result = arm_set_image_source(FIP_IMAGE_ID, "FIP_A"); - - if (result != 0) { - panic(); - } -#endif /* ARM_GPT_SUPPORT */ +#if ARM_GPT_SUPPORT && !PSA_FWU_SUPPORT + /* Always use the FIP from bank 0 */ + arm_set_fip_addr(0U); +#endif /* ARM_GPT_SUPPORT && !PSA_FWU_SUPPORT */ } /* diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk index de25a538d..262174f77 100644 --- a/plat/arm/common/arm_common.mk +++ b/plat/arm/common/arm_common.mk @@ -185,6 +185,18 @@ ifeq (${ARM_ARCH_MINOR},0) BL2_CPPFLAGS += -march=armv8-a+crc endif +ifeq ($(PSA_FWU_SUPPORT),1) + # GPT support is recommended as per PSA FWU specification hence + # PSA FWU implementation is tightly coupled with GPT support, + # and it does not support other formats. + ifneq ($(ARM_GPT_SUPPORT),1) + $(error For PSA_FWU_SUPPORT, ARM_GPT_SUPPORT must be enabled) + endif + FWU_MK := drivers/fwu/fwu.mk + $(info Including ${FWU_MK}) + include ${FWU_MK} +endif + ifeq (${ARCH}, aarch64) PLAT_INCLUDES += -Iinclude/plat/arm/common/aarch64 endif diff --git a/plat/arm/common/arm_io_storage.c b/plat/arm/common/arm_io_storage.c index c5d913e28..387086a29 100644 --- a/plat/arm/common/arm_io_storage.c +++ b/plat/arm/common/arm_io_storage.c @@ -5,6 +5,7 @@ */ #include <common/debug.h> +#include <drivers/fwu/fwu_metadata.h> #include <drivers/io/io_driver.h> #include <drivers/io/io_fip.h> #include <drivers/io/io_memmap.h> @@ -24,6 +25,13 @@ uintptr_t fip_dev_handle; static const io_dev_connector_t *memmap_dev_con; uintptr_t memmap_dev_handle; +#if ARM_GPT_SUPPORT +/* fip partition names */ +static const char * const fip_part_names[] = {"FIP_A", "FIP_B"}; +CASSERT(sizeof(fip_part_names)/sizeof(char *) == NR_OF_FW_BANKS, + assert_fip_partition_names_missing); +#endif /* ARM_GPT_SUPPORT */ + /* Weak definitions may be overridden in specific ARM standard platform */ #pragma weak plat_arm_io_setup #pragma weak plat_arm_get_alt_image_source @@ -139,17 +147,20 @@ bool arm_io_is_toc_valid(void) } #if ARM_GPT_SUPPORT -/********************************************************************** - * arm_set_image_source: Set image specification in IO policy +/****************************************************************************** + * Retrieve partition entry details such as offset and length, and set these + * details in the I/O policy of the requested image. * - * @image_id: id of the image whose specification to be set + * @image_id: image id whose I/O policy to be updated * - * @part_name: name of the partition that to be read for entry details + * @part_name: partition name whose details to be retrieved * - * set the entry and offset details of partition in global IO policy - * of the image - *********************************************************************/ -int arm_set_image_source(unsigned int image_id, const char *part_name) + * Returns 0 on success, error otherwise + * Alongside, returns device handle and image specification of requested + * image. + ******************************************************************************/ +int arm_set_image_source(unsigned int image_id, const char *part_name, + uintptr_t *dev_handle, uintptr_t *image_spec) { const partition_entry_t *entry = get_partition_entry(part_name); @@ -158,19 +169,82 @@ int arm_set_image_source(unsigned int image_id, const char *part_name) return -ENOENT; } - const struct plat_io_policy *policy = FCONF_GET_PROPERTY(arm, - io_policies, - image_id); + struct plat_io_policy *policy = FCONF_GET_PROPERTY(arm, + io_policies, + image_id); assert(policy != NULL); assert(policy->image_spec != 0UL); + io_block_spec_t *spec = (io_block_spec_t *)policy->image_spec; /* set offset and length of the image */ - io_block_spec_t *image_spec = (io_block_spec_t *)policy->image_spec; + spec->offset = PLAT_ARM_FLASH_IMAGE_BASE + entry->start; + spec->length = entry->length; - image_spec->offset = PLAT_ARM_FLASH_IMAGE_BASE + entry->start; - image_spec->length = entry->length; + *dev_handle = *(policy->dev_handle); + *image_spec = policy->image_spec; return 0; } -#endif + +/******************************************************************************* + * Set the source offset and length of the FIP image in its I/O policy. + * + * @active_fw_bank_idx: active firmware bank index gathered from FWU metadata. + ******************************************************************************/ +void arm_set_fip_addr(uint32_t active_fw_bank_idx) +{ + uintptr_t dev_handle __unused; + uintptr_t image_spec __unused; + + assert(active_fw_bank_idx < NR_OF_FW_BANKS); + + INFO("Booting with partition %s\n", fip_part_names[active_fw_bank_idx]); + + int result = arm_set_image_source(FIP_IMAGE_ID, + fip_part_names[active_fw_bank_idx], + &dev_handle, + &image_spec); + if (result != 0) { + panic(); + } +} +#endif /* ARM_GPT_SUPPORT */ + +#if PSA_FWU_SUPPORT +/******************************************************************************* + * Read the FIP partition of the GPT image corresponding to the active firmware + * bank to get its offset and length, and update these details in the I/O policy + * of the FIP image. + ******************************************************************************/ +void plat_fwu_set_images_source(struct fwu_metadata *metadata) +{ + arm_set_fip_addr(metadata->active_index); +} + +/******************************************************************************* + * Read the requested FWU metadata partition of the GPT image to get its offset + * and length, and update these details in the I/O policy of the requested FWU + * metadata image. + ******************************************************************************/ +int plat_fwu_set_metadata_image_source(unsigned int image_id, + uintptr_t *dev_handle, + uintptr_t *image_spec) +{ + int result = -1; + + if (image_id == FWU_METADATA_IMAGE_ID) { + result = arm_set_image_source(FWU_METADATA_IMAGE_ID, + "FWU-Metadata", + dev_handle, + image_spec); + } else if (image_id == BKUP_FWU_METADATA_IMAGE_ID) { + result = arm_set_image_source(BKUP_FWU_METADATA_IMAGE_ID, + "Bkup-FWU-Metadata", + dev_handle, + image_spec); + } + + return result; +} +#endif /* PSA_FWU_SUPPORT */ diff --git a/plat/arm/common/fconf/arm_fconf_io.c b/plat/arm/common/fconf/arm_fconf_io.c index 8e4469fb2..86fd6d565 100644 --- a/plat/arm/common/fconf/arm_fconf_io.c +++ b/plat/arm/common/fconf/arm_fconf_io.c @@ -18,6 +18,11 @@ #include <plat/arm/common/arm_fconf_io_storage.h> #include <platform_def.h> +#if PSA_FWU_SUPPORT +/* metadata entry details */ +static io_block_spec_t fwu_metadata_spec; +#endif /* PSA_FWU_SUPPORT */ + io_block_spec_t fip_block_spec = { /* * This is fixed FIP address used by BL1, BL2 loads partition table @@ -92,6 +97,20 @@ struct plat_io_policy policies[MAX_NUMBER_IDS] = { open_memmap }, #endif /* ARM_GPT_SUPPORT */ +#if PSA_FWU_SUPPORT + [FWU_METADATA_IMAGE_ID] = { + &memmap_dev_handle, + /* filled runtime from partition information */ + (uintptr_t)&fwu_metadata_spec, + open_memmap + }, + [BKUP_FWU_METADATA_IMAGE_ID] = { + &memmap_dev_handle, + /* filled runtime from partition information */ + (uintptr_t)&fwu_metadata_spec, + open_memmap + }, +#endif /* PSA_FWU_SUPPORT */ [FIP_IMAGE_ID] = { &memmap_dev_handle, (uintptr_t)&fip_block_spec, |