aboutsummaryrefslogtreecommitdiff
path: root/bl31/aarch64
diff options
context:
space:
mode:
authorDan Handley <dan.handley@arm.com>2014-05-29 17:11:04 +0100
committerDan Handley <dan.handley@arm.com>2014-05-29 17:11:04 +0100
commite10af77b2873396c9aca6e53326db3ca294f6de4 (patch)
tree2ae985f09cc2850253a2c294f29a1015424526d5 /bl31/aarch64
parent886dfdf21a6d0a522d6b16600c75b0593beeb294 (diff)
parenta37810853630098559d93f1b9ecdc222e63ef9cf (diff)
downloadarm-trusted-firmware-e10af77b2873396c9aca6e53326db3ca294f6de4.tar.gz
Merge pull request #111 'soby-mathew-sm:fix_cookie_to_int_handler'
Diffstat (limited to 'bl31/aarch64')
-rw-r--r--bl31/aarch64/runtime_exceptions.S6
1 files changed, 5 insertions, 1 deletions
diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S
index e3673f0..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
@@ -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