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
diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S
index 97ca956..a11cd71 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 4477fd7..1a6913a 100644
--- a/services/spd/tspd/tspd_main.c
+++ b/services/spd/tspd/tspd_main.c
@@ -90,7 +90,7 @@
#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 */