Hi,
On 4/15/21 6:48 PM, Alexandru Gagniuc wrote:
OP-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.
Signed-off-by: Alexandru Gagniuc mr.nuke.me@gmail.com
arch/arm/mach-stm32mp/spl.c | 90 +++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+)
diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c index b53659a698..1e26f18794 100644 --- a/arch/arm/mach-stm32mp/spl.c +++ b/arch/arm/mach-stm32mp/spl.c @@ -11,11 +11,13 @@ #include <hang.h> #include <init.h> #include <log.h> +#include <ram.h> #include <spl.h> #include <asm/cache.h> #include <asm/global_data.h> #include <asm/io.h> #include <asm/arch/sys_proto.h> +#include <mach/tzc.h> #include <linux/libfdt.h>
u32 spl_boot_device(void) @@ -92,6 +94,94 @@ __weak int board_early_init_f(void) return 0; }
+uint32_t stm32mp_get_dram_size(void) +{
- struct ram_info ram;
- struct udevice *dev;
- int ret;
- if (uclass_get_device(UCLASS_RAM, 0, &dev))
return 0;- ret = ram_get_info(dev, &ram);
- if (ret)
return 0;- return ram.size;
+}
+static int optee_get_reserved_memory(uint32_t *start, uint32_t *size) +{
- ofnode node;
- fdt_addr_t fdt_start;
- node = ofnode_path("/reserved-memory/optee");
- if (!ofnode_valid(node))
return 0;- fdt_start = ofnode_get_addr_size(node, "reg", size);
warning here because size is 'fdt_size_t *' not 'u32*'
arch/arm/mach-stm32mp/spl.c:122:48: warning: passing argument 3 of ‘ofnode_get_addr_size’ from inc
- *start = fdt_start;
- return (fdt_start < 0) ? fdt_start : 0;
+}
+#define CFG_SHMEM_SIZE 0x200000 +#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_size, tee_shmem_base;
- const uintptr_t tzc = STM32_TZC_BASE;
- int ret;
- if (dram_size == 0)
panic("Cannot determine DRAM size from devicetree\n");- ret = optee_get_reserved_memory(&optee_base, &optee_size);
- if (ret < 0 || optee_size <= CFG_SHMEM_SIZE)
panic("Invalid OPTEE reserved memory in devicetree\n");- tee_shmem_base = optee_base + optee_size - CFG_SHMEM_SIZE;
- 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);
Dump is always require, even for nomal boot, or only for debug cases ?
- dcache_disable();
You disable cache why,
it is not supported by OP-TEE ?
=> if it is a generic issue it should be in spl.c for case IH_OS_TEE or in
spl_optee_entry() and not in board specific weak function
as it done in bl31_entry for TF-A
Regards
Patrick