From 9bf31a59d187f6537066f05677972d9767e96c82 Mon Sep 17 00:00:00 2001 From: Jackson Cooper-Driver Date: Wed, 28 Feb 2024 13:05:41 +0000 Subject: [PATCH] fix(tc): remove timer interrupt from G1S TC3 and TC4 SCP makes use of the system timer interrupt as its own timer. Previously, this timer was marked as a G1S interrupt which routes the interrupt to the secure world and also enables it. This causes spurious interrupts once the SCP has unmasked the interrupt in the timer control itself. Note that we move the inclusion of the timer interrupt from CSS_G1S_INT_PROPS to CSS_G1S_IRQ_PROPS as the former is only used by TC. This will also result in removing the timer interrupt from TC2. This is not an issue as it does not make use of this interrupt in either the SCP or AP. Change-Id: I5cc88e2adffbc93fc3c9d9d41b5ba7235dbc39d9 Signed-off-by: Jackson Cooper-Driver Signed-off-by: Leo Yan --- include/plat/arm/css/common/css_def.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/plat/arm/css/common/css_def.h b/include/plat/arm/css/common/css_def.h index 0aea54803..6203937e8 100644 --- a/include/plat/arm/css/common/css_def.h +++ b/include/plat/arm/css/common/css_def.h @@ -58,12 +58,12 @@ INTR_PROP_DESC(CSS_IRQ_GPU_SMMU_0, GIC_HIGHEST_SEC_PRIORITY, grp, \ GIC_INTR_CFG_LEVEL), \ INTR_PROP_DESC(CSS_IRQ_TZC, GIC_HIGHEST_SEC_PRIORITY, grp, \ - GIC_INTR_CFG_LEVEL), \ - INTR_PROP_DESC(CSS_IRQ_SEC_SYS_TIMER, GIC_HIGHEST_SEC_PRIORITY, grp, \ GIC_INTR_CFG_LEVEL) #define CSS_G1S_IRQ_PROPS(grp) \ CSS_G1S_INT_PROPS(grp), \ + INTR_PROP_DESC(CSS_IRQ_SEC_SYS_TIMER, GIC_HIGHEST_SEC_PRIORITY, grp, \ + GIC_INTR_CFG_LEVEL), \ INTR_PROP_DESC(CSS_IRQ_TZ_WDOG, GIC_HIGHEST_SEC_PRIORITY, grp, \ GIC_INTR_CFG_LEVEL)