aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Gautier <yann.gautier@st.com>2019-04-25 13:29:12 +0200
committerYann Gautier <yann.gautier@foss.st.com>2021-03-23 13:06:15 +0100
commit236fc428bb7a934528a746a59f6a32cf9b28c49b (patch)
treee1c2974de723220ae102c0ffcd0ab5c9a983e448
parent1e80c498102eb6bc5d7e7e30666bc79b8b7b4cdb (diff)
downloadtrusted-firmware-a-236fc428bb7a934528a746a59f6a32cf9b28c49b.tar.gz
stm32mp1: add TZC400 interrupt management
TZC400 is configured to raise an interrupt in case of faulty access. Call the new added tzc400_it_handler, in case this interrupt occurs. Change-Id: Iaf4fa408a8eff99498042e11e2d6177bad39868c Signed-off-by: Yann Gautier <yann.gautier@st.com>
-rw-r--r--plat/st/stm32mp1/sp_min/sp_min_setup.c4
-rw-r--r--plat/st/stm32mp1/stm32mp1_security.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/plat/st/stm32mp1/sp_min/sp_min_setup.c b/plat/st/stm32mp1/sp_min/sp_min_setup.c
index b639fcb358..9b8c3ea27c 100644
--- a/plat/st/stm32mp1/sp_min/sp_min_setup.c
+++ b/plat/st/stm32mp1/sp_min/sp_min_setup.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2021, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -45,7 +45,7 @@ void sp_min_plat_fiq_handler(uint32_t id)
{
switch (id & INT_ID_MASK) {
case STM32MP1_IRQ_TZC400:
- ERROR("STM32MP1_IRQ_TZC400 generated\n");
+ (void)tzc400_it_handler();
panic();
break;
case STM32MP1_IRQ_AXIERRIRQ:
diff --git a/plat/st/stm32mp1/stm32mp1_security.c b/plat/st/stm32mp1/stm32mp1_security.c
index 3a29ba9661..195b3a5501 100644
--- a/plat/st/stm32mp1/stm32mp1_security.c
+++ b/plat/st/stm32mp1/stm32mp1_security.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2021, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -75,8 +75,7 @@ static void init_tzc400(void)
TZC_REGION_NSEC_ALL_ACCESS_RDWR);
#endif
- /* Raise an exception if a NS device tries to access secure memory */
- tzc400_set_action(TZC_ACTION_ERR);
+ tzc400_set_action(TZC_ACTION_INT);
tzc400_enable_filters();
}