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 handling still depends on platform and machine specific integrations. The previous patches added the required platform support for all i.MX8MM/N/P SoCs, but each i.MX8MM/N/P machine need add the machine support by itself. Allthough only i.MX8MM/N/P platform support was added, this commit prepare all ARMv8 platforms for the new overlay 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 25ba7e444843ea5ae817dd8103074e5a50fb48f0..ada4048d4ca07b5a2f8a5ee5ceb3e3b3ecb24af8 100644 --- a/arch/arm/mach-imx/imx9.c +++ b/arch/arm/mach-imx/imx9.c @@ -174,7 +174,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_registered()) { 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..6ed7802cc695a61253c937b24f5b1c2a1eea7732 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_registered() && + 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 54fd458bd9a1e38e665768d911934960358b42a9..3110f377212b272ae09bb15b20803b718c734f32 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -23,6 +23,7 @@ #include <linux/ctype.h> #include <linux/err.h> #include <pm_domain.h> +#include <tee/optee.h> static struct device_node *root_node; @@ -2133,6 +2134,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..695fc3b027ae81cc8c83cbf27aff261c0459aa8a 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_registered()) { static struct of_optee_fixup_data optee_fixup_data = { .shm_size = OPTEE_SHM_SIZE, .method = "smc", -- 2.47.3
