Merge pull request #111 'soby-mathew-sm:fix_cookie_to_int_handler'

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
 
@@ -125,6 +126,9 @@
 	/* Restore the reference to the 'handle' i.e. SP_EL3 */
 	mov	x2, x20
 
+	/*  x3 will point to a cookie (not used now) */
+	mov	x3, xzr
+
 	/* Call the interrupt type handler */
 	blr	x21
 

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 */