diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2015-10-27 10:01:06 +0000 |
|---|---|---|
| committer | Soby Mathew <soby.mathew@arm.com> | 2015-11-26 17:07:32 +0000 |
| commit | 5471841870074043dc53f2bd1a52bc48970038e2 (patch) | |
| tree | 3f7d8b6b563bc60ba45e45608de12387138970ec /bl31 | |
| parent | b39908af748fd273f28991f49c62eec775fce77c (diff) | |
Remove the IMF_READ_INTERRUPT_ID build option
The IMF_READ_INTERRUPT_ID build option enables a feature where the interrupt
ID of the highest priority pending interrupt is passed as a parameter to the
interrupt handler registered for that type of interrupt. This additional read
of highest pending interrupt id from GIC is problematic as it is possible that
the original interrupt may get deasserted and another interrupt of different
type maybe become the highest pending interrupt. Hence it is safer to prevent
such behaviour by removing the IMF_READ_INTERRUPT_ID build option.
The `id` parameter of the interrupt handler `interrupt_type_handler_t` is
now made a reserved parameter with this patch. It will always contain
INTR_ID_UNAVAILABLE.
Fixes ARM-software/tf-issues#307
Change-Id: I2173aae1dd37edad7ba6bdfb1a99868635fa34de
Diffstat (limited to 'bl31')
| -rw-r--r-- | bl31/aarch64/runtime_exceptions.S | 10 | ||||
| -rw-r--r-- | bl31/bl31.mk | 7 |
2 files changed, 0 insertions, 17 deletions
diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S index bbc7f1b4..28353202 100644 --- a/bl31/aarch64/runtime_exceptions.S +++ b/bl31/aarch64/runtime_exceptions.S @@ -130,16 +130,6 @@ mov x21, x0 mov x0, #INTR_ID_UNAVAILABLE -#if IMF_READ_INTERRUPT_ID - /* - * 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 x19, x0 - b.eq interrupt_exit_\label -#endif /* Set the current security state in the 'flags' parameter */ mrs x2, scr_el3 diff --git a/bl31/bl31.mk b/bl31/bl31.mk index 04e15420..a31c1f47 100644 --- a/bl31/bl31.mk +++ b/bl31/bl31.mk @@ -60,13 +60,6 @@ endif BL31_LINKERFILE := bl31/bl31.ld.S -# Flag used by the generic interrupt management framework to determine if -# upon the assertion of an interrupt, it should pass the interrupt id or not -IMF_READ_INTERRUPT_ID := 0 - -$(eval $(call assert_boolean,IMF_READ_INTERRUPT_ID)) -$(eval $(call add_define,IMF_READ_INTERRUPT_ID)) - # Flag used to inidicate if Crash reporting via console should be included # in BL3-1. This defaults to being present in DEBUG builds only ifndef CRASH_REPORTING |