From 3b9ebe3eb28f30b2631b094caf399bc2fb216c54 Mon Sep 17 00:00:00 2001 From: Silvano di Ninno Date: Wed, 21 Nov 2018 05:41:20 +0100 Subject: [PATCH] TEE-329-2: OP-TEE: Allow u-boot to add optee node in dtb If OP-TEE is loaded by ATF, u-boot will add optee device tree node in th edtb so that Linux can loads OP-TEE driver. Signed-off-by: Silvano di Ninno (cherry picked from commit 441c23698ffd5c90c6421113da55fae420072473) --- arch/arm/mach-imx/imx8/cpu.c | 49 ++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index 47dc225b4b..4fe6765dfe 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -787,6 +787,54 @@ static int config_smmu_fdt(void *blob) #endif #ifdef CONFIG_OF_SYSTEM_SETUP +static int ft_add_optee_node(void *fdt, bd_t *bd) +{ + const char *path, *subpath; + int offs; + + /* + * No TEE space allocated indicating no TEE running, so no + * need to add optee node in dts + */ + if (!rom_pointer[1]) + return 0; + + offs = fdt_increase_size(fdt, 512); + if (offs) { + printf("No Space for dtb\n"); + return 1; + } + + path = "/firmware"; + offs = fdt_path_offset(fdt, path); + if (offs < 0) { + path = "/"; + offs = fdt_path_offset(fdt, path); + + if (offs < 0) { + printf("Could not find root node.\n"); + return 1; + } + + subpath = "firmware"; + offs = fdt_add_subnode(fdt, offs, subpath); + if (offs < 0) { + printf("Could not create %s node.\n", subpath); + } + } + + subpath = "optee"; + offs = fdt_add_subnode(fdt, offs, subpath); + if (offs < 0) { + printf("Could not create %s node.\n", subpath); + } + + fdt_setprop_string(fdt, offs, "compatible", "linaro,optee-tz"); + fdt_setprop_string(fdt, offs, "method", "smc"); + + return 0; +} + int ft_system_setup(void *blob, bd_t *bd) { #ifdef BOOTAUX_RESERVED_MEM_BASE @@ -803,6 +851,7 @@ int ft_system_setup(void *blob, bd_t *bd) config_smmu_fdt(blob); #endif + ft_add_optee_node(blob, bd); return 0; } #endif -- 2.17.1