From cb72301d6598af97da392bfd590b369c0a5837d5 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Thu, 28 May 2020 15:41:57 +0800 Subject: [PATCH] MLK-24189-2 arm: imx: optee: ignore node create for xen Ignore node create for xen, currently we not have valid registers when booting in xen, it might have garbage value and cause kernel hang. Reviewed-by: Ye Li Signed-off-by: Peng Fan (cherry picked from commit 0c6cc66b1181c72b8f9165875b9db075a1de89de) --- arch/arm/mach-imx/dt_optee.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mach-imx/dt_optee.c b/arch/arm/mach-imx/dt_optee.c index 1451050..3441a0a 100644 --- a/arch/arm/mach-imx/dt_optee.c +++ b/arch/arm/mach-imx/dt_optee.c @@ -17,6 +17,9 @@ int ft_add_optee_node(void *fdt, bd_t *bd) phys_addr_t optee_start; size_t optee_size; + /* Not let uboot create the node */ + if (CONFIG_IS_ENABLED(XEN)) + return 0; /* * No TEE space allocated indicating no TEE running, so no * need to add optee node in dts -- 1.9.1