spl: mmc: Support OP-TEE payloads in Falcon mode
Subsystems (3)
PATCH 1/5 spl: mmc: Support OP-TEE payloads in Falcon mode
In general, Falcon mode means we're booting a linux kernel directly. With FIT images, however, an OP-TEE secure kernel can be booted before linux. Thus, if the next stage is an IH_OS_TEE, this isn't necessarily a problem.
Of course, a general solution would involve mmc_load_image_raw_os() only loading the binary, and leaving the decision of suitability to someone else. However, a rework of the boot flow is beyond the scope of this patch. Accept IH_OS_TEE as a valid OS value.
--- common/spl/spl_mmc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
common/spl/spl_mmc.c +4 -2
@@ -230,8 +230,10 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image,if (ret)return ret; -if (spl_image->os !=IH_OS_LINUX ) { -puts ("Expected Linux image is not found. Trying to start U-boot\n" ); +if (spl_image->os !=IH_OS_LINUX && spl_image->os !=IH_OS_TEE ) { +puts ("Expected OS image is not found. Instead found " ); +puts (genimg_get_os_name (spl_image->os)); +puts (". Trying to start U-boot\n" );return -ENOENT ; }
Signature · 1 line
2.26.2
PATCH 1/5 spl: mmc: Support OP-TEE payloads in Falcon mode
This series was re-sent in error. Please ignore.
Quoted 33 lines · Alexandru Gagniuc
In general, Falcon mode means we're booting a linux kernel directly. With FIT images, however, an OP-TEE secure kernel can be booted before linux. Thus, if the next stage is an
IH_OS_TEE, this isn't necessarily a problem.Of course, a general solution would involve
mmc_load_image_raw_os()only loading the binary, and leaving the decision of suitability to someone else. However, a rework of the boot flow is beyond the scope of this patch. AcceptIH_OS_TEEas a valid OS value.Signed-off-by Alexandru Gagniuc <[email protected]>--- common/spl/spl_mmc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)common/spl/spl_mmc.c +4
-2@@ -230,8 +230,10 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image,if (ret)return ret; -if (spl_image->os !=IH_OS_LINUX ) { -puts ("Expected Linux image is not found. Trying to start U-boot\n" ); +if (spl_image->os !=IH_OS_LINUX && spl_image->os !=IH_OS_TEE ) { +puts ("Expected OS image is not found. Instead found " ); +puts (genimg_get_os_name (spl_image->os)); +puts (". Trying to start U-boot\n" );return -ENOENT ; }
PATCH 1/5 spl: mmc: Support OP-TEE payloads in Falcon mode
Quoted 18 lines · Alex G.
This series was re-sent in error. Please ignore.
Quoted 14 lines · Alexandru Gagniuc
In general, Falcon mode means we're booting a linux kernel directly. With FIT images, however, an OP-TEE secure kernel can be booted before linux. Thus, if the next stage is an
IH_OS_TEE, this isn't necessarily a problem.Of course, a general solution would involve
mmc_load_image_raw_os()only loading the binary, and leaving the decision of suitability to someone else. However, a rework of the boot flow is beyond the scope of this patch. AcceptIH_OS_TEEas a valid OS value.Signed-off-by Alexandru Gagniuc <[email protected]>--- common/spl/spl_mmc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
PATCH 2/5 spl: Introduce spl_board_prepare_for_optee() hook
In reply to Alexandru GagniucOP-TEE requires some particular setup, which is not needed for linux or other payloads. Add a hook for platform-specific code to perform any OP-TEE related configuration and initialization.
--- common/spl/spl.c | 6 ++++++ include/spl.h | 14 ++++++++++++++ 2 files changed, 20 insertions(+)
common/spl/spl.c +6 -0
@@ -160,6 +160,11 @@ __weak void spl_board_prepare_for_linux(void)/* Nothing to do! */ } +__weak void spl_board_prepare_for_optee (void *fdt) +{ +/* Weak functions are stupid. Get rid of them! */ +} +__weak void spl_board_prepare_for_boot (void ) {/* Nothing to do! */
@@ -705,6 +710,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)#if CONFIG_IS_ENABLED (OPTEE )case IH_OS_TEE :debug ("Jumping to U-Boot via OP-TEE\n" ); +spl_board_prepare_for_optee (spl_image.fdt_addr);spl_optee_entry (NULL ,NULL , spl_image.fdt_addr, (void *)spl_image.entry_point);break ;
include/spl.h +14 -0
@@ -387,6 +387,20 @@ int spl_parse_image_header(struct spl_image_info *spl_image, const struct image_header *header);void spl_board_prepare_for_linux (void ); + +/** +* spl_board_prepare_for_optee() - Prepare board for an OPTEE payload +* +* Prepares the board for booting an OP-TEE payload. Initialization is platform +* specific, and may include configuring the TrustZone memory, and other +* initialization steps required by OP-TEE. +* Note that @fdt is not used directly by OP-TEE. OP-TEE passes this @fdt to +* its normal world target. This target is not guaranteed to be u-boot, so @fdt +* changes that would normally be done by u-boot should be done in this step. +* +* @fdt: Devicetree that will be passed on, or NULL +*/ +void spl_board_prepare_for_optee (void *fdt);void spl_board_prepare_for_boot (void );int spl_board_ubi_load_image (u32 boot_device);int spl_board_boot_device (u32 boot_device);
Signature · 1 line
2.26.2
PATCH 2/5 spl: Introduce spl_board_prepare_for_optee() hook
Hi Alexandru,
Quoted 61 lines · Alexandru Gagniuc
OP-TEE requires some particular setup, which is not needed for linux or other payloads. Add a hook for platform-specific code to perform any OP-TEE related configuration and initialization.
Signed-off-by Alexandru Gagniuc <[email protected]>--- common/spl/spl.c | 6 ++++++ include/spl.h | 14 ++++++++++++++ 2 files changed, 20 insertions(+)common/spl/spl.c +6
-0@@ -160,6 +160,11 @@ __weak void spl_board_prepare_for_linux(void)/* Nothing to do! */ } +__weak void spl_board_prepare_for_optee (void *fdt) +{ +/* Weak functions are stupid. Get rid of them! */ +} +__weak void spl_board_prepare_for_boot (void ) {/* Nothing to do! */ @@ -705,6 +710,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)#if CONFIG_IS_ENABLED (OPTEE )case IH_OS_TEE :debug ("Jumping to U-Boot via OP-TEE\n" ); +spl_board_prepare_for_optee (spl_image.fdt_addr);spl_optee_entry (NULL ,NULL , spl_image.fdt_addr, (void *)spl_image.entry_point);break ;include/spl.h +14
-1@@ -387,6 +387,20 @@ int spl_parse_image_header(struct spl_image_info *spl_image, const struct image_header *header);void spl_board_prepare_for_linux (void ); + +/** +* spl_board_prepare_for_optee() - Prepare board for an OPTEE payload +* +* Prepares the board for booting an OP-TEE payload. Initialization is platform +* specific, and may include configuring the TrustZone memory, and other +* initialization steps required by OP-TEE. +* Note that @fdt is not used directly by OP-TEE. OP-TEE passes this @fdt to +* its normal world target. This target is not guaranteed to be u-boot, so @fdt +* changes that would normally be done by u-boot should be done in this step. +* +* @fdt: Devicetree that will be passed on, or NULL +*/ +void spl_board_prepare_for_optee (void *fdt);void spl_board_prepare_for_boot (void );int spl_board_ubi_load_image (u32 boot_device);int spl_board_boot_device (u32 boot_device); --
Quoted 2 lines
2.26.2
One way to get rid of the weak function would be to introduce some sort of event handler / runner or hook system. We could have an enum of available events and allow handlers to register themselves. Then we could do something like:
struct event ev;
ev.type = EVT_SPL_OS_PREPARE; ev.data.spl_os_prepare = IG_OS_TEE;
ret = event_post(&ev);
(return code -ENOSYS if nothing handled the event)
Could use a ilnker_list to set up the handlers at build time. Perhaps could allow runtime registration if useful.
Regards,
Simon
PATCH 3/5 arm: stm32mp: Implement support for TZC 400 controller
In reply to Alexandru GagniucThe purpose of this change is to allow configuring TrustZone (TZC) memory permissions. For example, OP-TEE expects TZC regions to be configured in a very particular way. The API presented here is intended to allow exactly that.
UCLASS support is not implemented, because it would not be too useful. Changing TZC permissions needs to be done with care, so as not to cut off access to memory we are currently using. One place where we can use this is at the end of SPL, right before jumping to OP-TEE.
--- arch/arm/mach-stm32mp/Makefile | 1 + arch/arm/mach-stm32mp/include/mach/tzc.h | 33 ++++++ arch/arm/mach-stm32mp/tzc400.c | 135 +++++++++++++++++++++++ 3 files changed, 169 insertions(+) create mode 100644 arch/arm/mach-stm32mp/include/mach/tzc.h create mode 100644 arch/arm/mach-stm32mp/tzc400.c
arch/arm/mach-stm32mp/Makefile +1 -0
@@ -10,6 +10,7 @@ obj-y += bsec.o ifdef CONFIG_SPL_BUILD obj-y += spl.o +obj-y += tzc400.o else obj-$(CONFIG_CMD_STM32PROG) += cmd_stm32prog/ obj-$(CONFIG_CMD_STM32KEY) += cmd_stm32key.o
arch/arm/mach-stm32mp/include/mach/tzc.h new file +33 -0
@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Simple API for configuring TrustZone memory regions +* +* The premise is that the desired TZC layout is known beforehand, and it can +* be configured in one step. tzc_configure() provides this functionality. +*/ +#ifndef MACH_TZC_H +#define MACH_TZC_H + +#include <linux/types.h> + +enum tzc_sec_mode { +TZC_ATTR_SEC_NONE =0 , +TZC_ATTR_SEC_R =1 , +TZC_ATTR_SEC_W =2 , +TZC_ATTR_SEC_RW =3 +}; + +struct tzc_region { +uintptr_t base; +uintptr_t top; +enum tzc_sec_mode sec_mode; +uint16_t nsec_id; +uint16_t filters_mask; +}; + +int tzc_configure (uintptr_t tzc,const struct tzc_region *cfg); +int tzc_disable_filters (uintptr_t tzc,uint16_t filters_mask); +int tzc_enable_filters (uintptr_t tzc,uint16_t filters_mask); +void tzc_dump_config (uintptr_t tzc); + +#endif /* MACH_TZC_H */
arch/arm/mach-stm32mp/tzc400.c new file +135 -0
135 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH 3/5 arm: stm32mp: Implement support for TZC 400 controller
Hi Alexandru,
Quoted 11 lines · Alexandru Gagniuc
The purpose of this change is to allow configuring TrustZone (TZC) memory permissions. For example, OP-TEE expects TZC regions to be configured in a very particular way. The API presented here is intended to allow exactly that.
UCLASS support is not implemented, because it would not be too useful. Changing TZC permissions needs to be done with care, so as not to cut off access to memory we are currently using. One place where we can use this is at the end of SPL, right before jumping to OP-TEE.
Quoted 8 lines
Signed-off-by Alexandru Gagniuc <[email protected]>--- arch/arm/mach-stm32mp/Makefile | 1 + arch/arm/mach-stm32mp/include/mach/tzc.h | 33 ++++++ arch/arm/mach-stm32mp/tzc400.c | 135 +++++++++++++++++++++++ 3 files changed, 169 insertions(+) create mode 100644 arch/arm/mach-stm32mp/include/mach/tzc.h create mode 100644 arch/arm/mach-stm32mp/tzc400.c
If this is an API you should add comments to the header file structs and functions.
Is this API specific to just this chip?
Regards,
Simon
PATCH 3/5 arm: stm32mp: Implement support for TZC 400 controller
Quoted 23 lines · Simon Glass
Hi Alexandru,
Quoted 11 lines · Alexandru Gagniuc
The purpose of this change is to allow configuring TrustZone (TZC) memory permissions. For example, OP-TEE expects TZC regions to be configured in a very particular way. The API presented here is intended to allow exactly that.
UCLASS support is not implemented, because it would not be too useful. Changing TZC permissions needs to be done with care, so as not to cut off access to memory we are currently using. One place where we can use this is at the end of SPL, right before jumping to OP-TEE.
Quoted 8 lines
Signed-off-by Alexandru Gagniuc <[email protected]>--- arch/arm/mach-stm32mp/Makefile | 1 + arch/arm/mach-stm32mp/include/mach/tzc.h | 33 ++++++ arch/arm/mach-stm32mp/tzc400.c | 135 +++++++++++++++++++++++ 3 files changed, 169 insertions(+)create mode 100644
arch/arm/mach-stm32mp/include/mach/tzc.hcreate mode 100644arch/arm/mach-stm32mp/tzc400.c
Quoted 4 lines
If this is an API you should add comments to the header file structs and functions.
Is this API specific to just this chip?
I've designed and validated this to set up stm32mp for starting up OP-TEE. It's a narrow use case. I can't speak for other chips.
Alex
PATCH 4/5 stm32mp1: spl: Configure TrustZone controller for OP-TEE
In reply to Alexandru GagniucOP-TEE is very particular about how the TZC should be configured. When booting an OP-TEE payload, an incorrect TZC configuration will result in a panic.
Most information can be derived from the SPL devicetree. The only information we don't have is the split between TZDRAM and shared memory. This has to be hardcoded. The rest of the configuration is fairly easy, and only requires 3 TZC regions. Configure them.
--- arch/arm/mach-stm32mp/spl.c | 84 +++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+)
arch/arm/mach-stm32mp/spl.c +84 -0
@@ -15,6 +15,7 @@#include <asm/cache.h> #include <asm/io.h> #include <asm/arch/sys_proto.h> +#include <mach/tzc.h> #include <linux/libfdt.h> u32 spl_boot_device (void )
@@ -91,6 +92,89 @@ __weak int board_early_init_f(void)return 0 ; } +uint32_t stm32mp_get_dram_size (void ) +{ +uint32_t ram_size =0 ; +struct udevice *dev; +ofnode node; + +if (uclass_get_device (UCLASS_RAM ,0 , &dev)) +return 0 ; + +dev_for_each_subnode (node, dev) { + ram_size =ofnode_read_u32_default (node,"st,mem-size" ,0 ); +if (ram_size) +break ; + } + +return ram_size; +} + +uint32_t optee_get_reserved_memory_base (void ) +{ +ofnode node; +fdt_addr_t start; + + node =ofnode_path ("/reserved-memory/optee" ); +if (!ofnode_valid (node)) +return 0 ; + + start =ofnode_get_addr (node); +return (start <0 ) ?0 : (uintptr_t )start; +} + +#define CFG_TZDRAM_SIZE 0x01e00000 +#define STM32_TZC_NSID_ALL 0xffff +#define STM32_TZC_FILTER_ALL 3 + +void stm32_init_tzc_for_optee (void ) +{ +const uint32_t dram_size =stm32mp_get_dram_size (); +const uintptr_t dram_top =STM32_DDR_BASE + (dram_size -1 ); +uint32_t optee_base =optee_get_reserved_memory_base (); +uint32_t tee_shmem_base = optee_base +CFG_TZDRAM_SIZE ; +const uintptr_t tzc =STM32_TZC_BASE ; + +if (dram_size ==0 ) +panic ("Cannot determine DRAM size from devicetree\n" ); + +const struct tzc_region optee_config[] = { + { + .base =STM32_DDR_BASE , + .top = optee_base -1 , + .sec_mode =TZC_ATTR_SEC_NONE , + .nsec_id =STM32_TZC_NSID_ALL , + .filters_mask =STM32_TZC_FILTER_ALL , + }, { + .base = optee_base, + .top = tee_shmem_base -1 , + .sec_mode =TZC_ATTR_SEC_RW , + .nsec_id =0 , + .filters_mask =STM32_TZC_FILTER_ALL , + }, { + .base = tee_shmem_base, + .top = dram_top, + .sec_mode =TZC_ATTR_SEC_NONE , + .nsec_id =STM32_TZC_NSID_ALL , + .filters_mask =STM32_TZC_FILTER_ALL , + }, { + .top =0 , + } + }; + +flush_dcache_all (); + +tzc_configure (tzc, optee_config); +tzc_dump_config (tzc); + +dcache_disable (); +} + +void spl_board_prepare_for_optee (void *fdt) +{ +stm32_init_tzc_for_optee (); +} +void board_init_f (ulong dummy) {struct udevice *dev;
Signature · 1 line
2.26.2
PATCH 5/5 ARM: dts: stm32mp: Add OP-TEE reserved memory to SPL dtb
In reply to Alexandru GagniucAdd the "/reserved-memory/optee" node to the SPL devicetree. The purpose is to allow configuring TZC regions when booting OP-TEE.
--- arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi +3 -0
@@ -30,9 +30,12 @@ }; reserved-memory { + u-boot,dm-pre-reloc; + optee at de000000 { reg = <0xde000000 0x02000000>; no-map; + u-boot,dm-pre-reloc; }; };
Signature · 1 line
2.26.2