From a37810853630098559d93f1b9ecdc222e63ef9cf Mon Sep 17 00:00:00 2001 From: Soby Mathew Date: Wed, 28 May 2014 17:14:36 +0100 Subject: [PATCH] Fix compilation issue for IMF_READ_INTERRUPT_ID build flag This patch fixes the compilation issue for trusted firmware when the IMF_READ_INTERRUPT_ID is enabled. Change-Id: I94ab613b9bc96a7c1935796c674dc42246aaafee --- bl31/aarch64/runtime_exceptions.S | 3 ++- services/spd/tspd/tspd_main.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S index 97ca956df..a11cd71f1 100644 --- a/bl31/aarch64/runtime_exceptions.S +++ b/bl31/aarch64/runtime_exceptions.S @@ -105,8 +105,9 @@ * Read the id of the highest priority pending interrupt. If * no interrupt is asserted then return to where we came from. */ + mov x19, #INTR_ID_UNAVAILABLE bl plat_ic_get_pending_interrupt_id - cmp x0, #INTR_ID_UNAVAILABLE + cmp x19, x0 b.eq interrupt_exit_\label #endif diff --git a/services/spd/tspd/tspd_main.c b/services/spd/tspd/tspd_main.c index 4477fd78b..1a6913a57 100644 --- a/services/spd/tspd/tspd_main.c +++ b/services/spd/tspd/tspd_main.c @@ -90,7 +90,7 @@ static uint64_t tspd_sel1_interrupt_handler(uint32_t id, #if IMF_READ_INTERRUPT_ID /* Check the security status of the interrupt */ - assert(ic_get_interrupt_group(id) == SECURE); + assert(plat_ic_get_interrupt_type(id) == INTR_TYPE_S_EL1); #endif /* Sanity check the pointer to this cpu's context */