From 07e96d1d2958b6f121476fd391ac67bf8c2c4735 Mon Sep 17 00:00:00 2001 From: Zelalem Aweke Date: Fri, 1 Oct 2021 12:30:49 -0500 Subject: [PATCH] feat(rme): disable Watchdog for Arm platforms if FEAT_RME enabled In the typical TF-A boot flow, the Trusted Watchdog is started at the beginning of BL1 and then stopped in BL1 after returning from BL2. However, in the RME boot flow there is no return path from BL2 to BL1. Therefore, disable the Watchdog if ENABLE_RME is set. Signed-off-by: Zelalem Aweke Change-Id: Id88fbfab8e8440642414bed48c50e3fcb23f3621 --- plat/arm/common/arm_common.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk index ae9afb795..d14d10143 100644 --- a/plat/arm/common/arm_common.mk +++ b/plat/arm/common/arm_common.mk @@ -52,9 +52,10 @@ $(eval $(call assert_boolean,ARM_RECOM_STATE_ID_ENC)) $(eval $(call add_define,ARM_RECOM_STATE_ID_ENC)) # Process ARM_DISABLE_TRUSTED_WDOG flag -# By default, Trusted Watchdog is always enabled unless SPIN_ON_BL1_EXIT is set +# By default, Trusted Watchdog is always enabled unless +# SPIN_ON_BL1_EXIT or ENABLE_RME is set ARM_DISABLE_TRUSTED_WDOG := 0 -ifeq (${SPIN_ON_BL1_EXIT}, 1) +ifneq ($(filter 1,${SPIN_ON_BL1_EXIT} ${ENABLE_RME}),) ARM_DISABLE_TRUSTED_WDOG := 1 endif $(eval $(call assert_boolean,ARM_DISABLE_TRUSTED_WDOG))