MLK-18502: imx8mm: Bypass ID SWAP when trustzone is enabled

Enable TZASC on i.MX 8mm.
There is a need on 8MM to enable
the BYPASS ID SWAP bit (GPR10 bit 1) in order
for GPU not to generated AXI bus errors.

Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 76c9db3ccc8c6e8f719172254c4f9bbdbd12db23)

diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 573e42d..1eeaec3 100644 (file)
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -59,6 +59,9 @@ void enable_tzc380(void)
        /* Enable TZASC and lock setting */
        setbits_le32(&gpr->gpr[10], GPR_TZASC_EN);
        setbits_le32(&gpr->gpr[10], GPR_TZASC_EN_LOCK);
+#ifdef CONFIG_IMX8MM
+       setbits_le32(&gpr->gpr[10], GPR_TZASC_SWAP_ID);
+#endif
 }
 
 void set_wdog_reset(struct wdog_regs *wdog)