diff options
author | Dan Handley <dan.handley@arm.com> | 2014-05-29 17:11:04 +0100 |
---|---|---|
committer | Dan Handley <dan.handley@arm.com> | 2014-05-29 17:11:04 +0100 |
commit | e10af77b2873396c9aca6e53326db3ca294f6de4 (patch) | |
tree | 2ae985f09cc2850253a2c294f29a1015424526d5 | |
parent | 886dfdf21a6d0a522d6b16600c75b0593beeb294 (diff) | |
parent | a37810853630098559d93f1b9ecdc222e63ef9cf (diff) | |
download | trusted-firmware-a-e10af77b2873396c9aca6e53326db3ca294f6de4.tar.gz |
Merge pull request #111 'soby-mathew-sm:fix_cookie_to_int_handler'v0.4-rc2
-rw-r--r-- | bl31/aarch64/runtime_exceptions.S | 6 | ||||
-rw-r--r-- | services/spd/tspd/tspd_main.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S index e3673f0d99..a11cd71f1f 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 @@ -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 diff --git a/services/spd/tspd/tspd_main.c b/services/spd/tspd/tspd_main.c index 4477fd78b3..1a6913a57a 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 */ |