The BL32 OP-TEE binary can provide an overlay which contains all required configurations made by the secure-os, e.g. reserved-memory nodes, the firmware-interface (smc) and so on.
This overlay can be used to uniform the OP-TEE configuration handling for all OF platforms. While this patch is platform agnostic, the OP-TEE overlay supply handling still depends on platform specific integrations. Therefore only i.MX8MM/N/P platforms support this new feature yet. However, prepare all ARMv8 platforms for the new loading mechanism. Signed-off-by: Marco Felsch <[email protected]> --- arch/arm/mach-imx/imx9.c | 2 +- arch/arm/mach-rockchip/rockchip.c | 3 ++- drivers/of/base.c | 3 +++ drivers/soc/imx/soc-imx8m.c | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-imx/imx9.c b/arch/arm/mach-imx/imx9.c index dd4fbf099e601dda3c01a4e2d64a9552d2f616e5..7eccba4ed630c73b6b4fe266f742fe3d4ed63dd5 100644 --- a/arch/arm/mach-imx/imx9.c +++ b/arch/arm/mach-imx/imx9.c @@ -173,7 +173,7 @@ int imx93_init(void) imx93_set_arm_clock(); imx93_bootsource(); - if (IS_ENABLED(CONFIG_PBL_OPTEE)) { + if (IS_ENABLED(CONFIG_PBL_OPTEE) && !optee_overlay_applied()) { static struct of_optee_fixup_data optee_fixup_data = { .shm_size = OPTEE_SHM_SIZE, .method = "smc", diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c index 0828f0fa72a9ad2495e012a42918c4b5431652e7..30cec0f0fe7cb651a1b157d5bb257fc67302422a 100644 --- a/arch/arm/mach-rockchip/rockchip.c +++ b/arch/arm/mach-rockchip/rockchip.c @@ -33,7 +33,8 @@ static int rockchip_init(void) { const struct optee_header *hdr = rk_scratch_get_optee_hdr(); - if (IS_ENABLED(CONFIG_PBL_OPTEE) && optee_verify_header(hdr) == 0) { + if (IS_ENABLED(CONFIG_PBL_OPTEE) && !optee_overlay_applied() && + optee_verify_header(hdr) == 0) { static struct of_optee_fixup_data optee_fixup_data = { .shm_size = OPTEE_SHM_SIZE, .method = "smc", diff --git a/drivers/of/base.c b/drivers/of/base.c index c20fffb899a9c87910f424f5e4fd116f11cea546..203ebca1bf30cda5ce817a5d6b6eb437fc3befc6 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -22,6 +22,7 @@ #include <linux/clk.h> #include <linux/ctype.h> #include <linux/err.h> +#include <tee/optee.h> static struct device_node *root_node; @@ -2129,6 +2130,8 @@ int barebox_register_fdt(const void *dtb) return PTR_ERR(root); } + optee_register_overlay(); + return barebox_register_of(root); } diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c index 3b83284fcbfd56d543cc300b8d42771202aa0bbb..ecc5f30df35dfd89a485a3f6883ab33fbafb897e 100644 --- a/drivers/soc/imx/soc-imx8m.c +++ b/drivers/soc/imx/soc-imx8m.c @@ -207,7 +207,8 @@ static int imx8_soc_imx8m_init(struct soc_device_attribute *soc_dev_attr) imx_set_reset_reason(src + IMX7_SRC_SRSR, imx7_reset_reasons); pr_info("%s unique ID: %s\n", cputypestr, uid); - if (IS_ENABLED(CONFIG_PBL_OPTEE) && imx8m_tzc380_is_enabled()) { + if (IS_ENABLED(CONFIG_PBL_OPTEE) && imx8m_tzc380_is_enabled() && + !optee_overlay_applied()) { static struct of_optee_fixup_data optee_fixup_data = { .shm_size = OPTEE_SHM_SIZE, .method = "smc", -- 2.47.3
