summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvano di Ninno <silvano.dininno@nxp.com>2020-03-25 09:32:44 +0100
committerSilvano di Ninno <silvano.dininno@nxp.com>2020-03-27 12:22:09 +0100
commit0d6c41cc73124e64a997444e5a311ebc910bd3b0 (patch)
tree24dc8c943ef641b85e61298951c2b35957d00988
parented93034d76fab46ecc79b1d53af997d6d31b5c41 (diff)
TEE-532-5: plat: imx8qm: add optee support
Port and cleanup OP-TEE support. Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com>
-rw-r--r--plat/imx/imx8qm/imx8qm_bl31_setup.c26
-rw-r--r--plat/imx/imx8qm/include/platform_def.h8
-rw-r--r--plat/imx/imx8qm/platform.mk6
3 files changed, 29 insertions, 11 deletions
diff --git a/plat/imx/imx8qm/imx8qm_bl31_setup.c b/plat/imx/imx8qm/imx8qm_bl31_setup.c
index afb07233..864a8802 100644
--- a/plat/imx/imx8qm/imx8qm_bl31_setup.c
+++ b/plat/imx/imx8qm/imx8qm_bl31_setup.c
@@ -172,7 +172,7 @@ void mx8_partition_resources(void)
bool owned, owned2;
sc_err_t err;
int i;
-#ifdef SPD_trusty
+#if defined(SPD_opteed) || defined(SPD_trusty)
sc_rm_mr_t mr_tee = 64;
bool mr_tee_atf_same = false;
sc_faddr_t reg_start;
@@ -216,7 +216,7 @@ void mx8_partition_resources(void)
if (BL31_BASE >= start && (BL31_LIMIT - 1) <= end) {
mr_record = mr; /* Record the mr for ATF running */
}
-#ifdef SPD_trusty
+#if defined(SPD_opteed) || defined(SPD_trusty)
else if (BL32_BASE >= start && (BL32_LIMIT -1) <= end) {
mr_tee = mr;
}
@@ -233,7 +233,7 @@ void mx8_partition_resources(void)
}
}
-#ifdef SPD_trusty
+#if defined(SPD_opteed) || defined(SPD_trusty)
if (mr_tee != 64) {
err = sc_rm_get_memreg_info(ipc_handle, mr_tee, &start, &end);
if (err) {
@@ -266,7 +266,7 @@ void mx8_partition_resources(void)
if (mr_record != 64) {
err = sc_rm_get_memreg_info(ipc_handle, mr_record, &start, &end);
-#ifdef SPD_trusty
+#if defined(SPD_opteed) || defined(SPD_trusty)
if (BL32_BASE >= start && (BL32_LIMIT - 1) <= end)
mr_tee_atf_same = true;
#endif
@@ -276,7 +276,7 @@ void mx8_partition_resources(void)
ERROR("Memreg get info failed, %u\n", mr_record);
} else {
if ((BL31_LIMIT - 1) < end) {
-#ifdef SPD_trusty
+#if defined(SPD_opteed) || defined(SPD_trusty)
if ((end > BL32_BASE) && mr_tee_atf_same)
reg_end = BL32_BASE - 1;
#endif
@@ -289,7 +289,7 @@ void mx8_partition_resources(void)
ERROR("Memreg assign failed, 0x%llx -- 0x%llx\n", (sc_faddr_t)BL31_LIMIT, reg_end);
}
}
-#ifdef SPD_trusty
+#if defined(SPD_opteed) || defined(SPD_trusty)
if (mr_tee_atf_same) {
if ((BL32_LIMIT - 1) < end) {
reg_start = BL32_LIMIT;
@@ -465,14 +465,24 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
bl33_image_ep_info.pc = PLAT_NS_IMAGE_OFFSET;
bl33_image_ep_info.spsr = get_spsr_for_bl33_entry();
-#ifdef SPD_trusty
+#if defined(SPD_opteed) || defined(SPD_trusty)
SET_PARAM_HEAD(&bl32_image_ep_info, PARAM_EP, VERSION_1, 0);
SET_SECURITY_STATE(bl32_image_ep_info.h.attr, SECURE);
bl32_image_ep_info.pc = BL32_BASE;
bl32_image_ep_info.spsr = 0;
+#ifdef SPD_trusty
bl32_image_ep_info.args.arg0 = BL32_SIZE;
bl32_image_ep_info.args.arg1 = BL32_BASE;
#endif
+#ifdef SPD_opteed
+ bl33_image_ep_info.args.arg1 = BL32_BASE;
+ bl33_image_ep_info.args.arg2 = BL32_SIZE;
+ /* Make sure memory is clean */
+ mmio_write_32(BL32_FDT_OVERLAY_ADDR, 0);
+ bl33_image_ep_info.args.arg3 = BL32_FDT_OVERLAY_ADDR;
+ bl32_image_ep_info.args.arg3 = BL32_FDT_OVERLAY_ADDR;
+#endif
+#endif
SET_SECURITY_STATE(bl33_image_ep_info.h.attr, NON_SECURE);
/* init the first cluster's cci slave interface */
@@ -497,7 +507,7 @@ void bl31_plat_arch_setup(void)
MT_RW | MT_MEMORY | MT_SECURE);
mmap_add(imx_mmap);
-#ifdef SPD_trusty
+#if defined(SPD_opteed) || defined(SPD_trusty)
mmap_add_region(BL32_BASE, BL32_BASE, BL32_SIZE, MT_MEMORY | MT_RW);
#endif
diff --git a/plat/imx/imx8qm/include/platform_def.h b/plat/imx/imx8qm/include/platform_def.h
index ff838ed2..e70ff06b 100644
--- a/plat/imx/imx8qm/include/platform_def.h
+++ b/plat/imx/imx8qm/include/platform_def.h
@@ -43,11 +43,13 @@
#define OCRAM_BASE 0x100000
#define OCRAM_ALIAS_SIZE 0x18000 /* The lower 96KB is in OCRAM alias from 0x0 */
+#define BL32_SHM_SIZE 0x00400000
#ifdef SPD_trusty
-#define BL32_BASE 0xfe000000
-#define BL32_SIZE 0x02000000
-#define BL32_LIMIT 0x100000000
+#define BL32_LIMIT (BL32_BASE + BL32_SIZE)
+#else
+#define BL32_LIMIT (BL32_BASE + BL32_SIZE - BL32_SHM_SIZE)
#endif
+#define BL32_FDT_OVERLAY_ADDR 0x9d000000
#define PLAT_GICD_BASE 0x51a00000
#define PLAT_GICR_BASE 0x51b00000
diff --git a/plat/imx/imx8qm/platform.mk b/plat/imx/imx8qm/platform.mk
index e62c5740..d6ff720a 100644
--- a/plat/imx/imx8qm/platform.mk
+++ b/plat/imx/imx8qm/platform.mk
@@ -49,6 +49,12 @@ $(eval $(call add_define,ENABLE_CPU_DYNAMIC_RETENTION))
ENABLE_L2_DYNAMIC_RETENTION := 1
$(eval $(call add_define,ENABLE_L2_DYNAMIC_RETENTION))
+BL32_BASE ?= 0xfe000000
+$(eval $(call add_define,BL32_BASE))
+
+BL32_SIZE ?= 0x2000000
+$(eval $(call add_define,BL32_SIZE))
+
ifeq (${SPD},trusty)
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif