diff options
| author | Marco Felsch <m.felsch@pengutronix.de> | 2023-09-06 16:07:37 +0200 |
|---|---|---|
| committer | Marco Felsch <m.felsch@pengutronix.de> | 2023-10-05 16:02:10 +0200 |
| commit | 4827613c9a8db6238e9411b508ef20bda3113146 (patch) | |
| tree | 66b31a9ecc85d56cd6df68fd7b1b5778a6586fba /plat | |
| parent | 85625646692597ba8a1829efaadf56163450efaf (diff) | |
fix(imx8m): map BL32 memory only if SPD_opteed or SPD_trusty is enabled
Always map the BL32 memory can interfere with the BL33 mapping if the
BL33 is not aware of the mapping, e.g. different memory tagging
secure/non-secure. Therefore map the memory only if BL32 (opteed,
trusty) is enabled and BL33 is aware of this memory mapping.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Change-Id: I9c2bf78aa6e88c93e749a9248724186fee9df864
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c | 2 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c | 2 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mp/imx8mp_bl31_setup.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c index 405a8f992..dc9dd5949 100644 --- a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c +++ b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c @@ -213,8 +213,10 @@ void bl31_plat_arch_setup(void) #if USE_COHERENT_MEM MAP_COHERENT_MEM, #endif +#if defined(SPD_opteed) || defined(SPD_trusty) /* Map TEE memory */ MAP_BL32_TOTAL, +#endif {0} }; diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c index 2308dfc95..f9e430bf9 100644 --- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c +++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c @@ -217,8 +217,10 @@ void bl31_plat_arch_setup(void) #if USE_COHERENT_MEM MAP_COHERENT_MEM, #endif +#if defined(SPD_opteed) || defined(SPD_trusty) /* Map TEE memory */ MAP_BL32_TOTAL, +#endif {0} }; diff --git a/plat/imx/imx8m/imx8mp/imx8mp_bl31_setup.c b/plat/imx/imx8m/imx8mp/imx8mp_bl31_setup.c index 1f527bfde..43fa06463 100644 --- a/plat/imx/imx8m/imx8mp/imx8mp_bl31_setup.c +++ b/plat/imx/imx8m/imx8mp/imx8mp_bl31_setup.c @@ -206,8 +206,10 @@ void bl31_plat_arch_setup(void) #if USE_COHERENT_MEM MAP_COHERENT_MEM, #endif +#if defined(SPD_opteed) || defined(SPD_trusty) /* Map TEE memory */ MAP_BL32_TOTAL, +#endif {0} }; |