diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2016-08-31 14:36:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-31 14:36:20 +0100 |
| commit | f6ace15f9fdaa78342e758ebc61699754a4d6be2 (patch) | |
| tree | 00bb676a291cb9690c7cb9e44e315857346a8e71 /bl1 | |
| parent | 9115b86795439c91618df32962e29fa951a94c46 (diff) | |
| parent | 5bbc451eeaea9248026258f4640065c5a547eeb0 (diff) | |
Merge pull request #689 from yatharth-arm/yk/plat_report_expn
Remove looping around `plat_report_exception`
Diffstat (limited to 'bl1')
| -rw-r--r-- | bl1/aarch64/bl1_exceptions.S | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/bl1/aarch64/bl1_exceptions.S b/bl1/aarch64/bl1_exceptions.S index 68f9b7ae..f080fe89 100644 --- a/bl1/aarch64/bl1_exceptions.S +++ b/bl1/aarch64/bl1_exceptions.S @@ -49,25 +49,25 @@ vector_base bl1_exceptions vector_entry SynchronousExceptionSP0 mov x0, #SYNC_EXCEPTION_SP_EL0 bl plat_report_exception - b SynchronousExceptionSP0 + bl plat_panic_handler check_vector_size SynchronousExceptionSP0 vector_entry IrqSP0 mov x0, #IRQ_SP_EL0 bl plat_report_exception - b IrqSP0 + bl plat_panic_handler check_vector_size IrqSP0 vector_entry FiqSP0 mov x0, #FIQ_SP_EL0 bl plat_report_exception - b FiqSP0 + bl plat_panic_handler check_vector_size FiqSP0 vector_entry SErrorSP0 mov x0, #SERROR_SP_EL0 bl plat_report_exception - b SErrorSP0 + bl plat_panic_handler check_vector_size SErrorSP0 /* ----------------------------------------------------- @@ -77,25 +77,25 @@ vector_entry SErrorSP0 vector_entry SynchronousExceptionSPx mov x0, #SYNC_EXCEPTION_SP_ELX bl plat_report_exception - b SynchronousExceptionSPx + bl plat_panic_handler check_vector_size SynchronousExceptionSPx vector_entry IrqSPx mov x0, #IRQ_SP_ELX bl plat_report_exception - b IrqSPx + bl plat_panic_handler check_vector_size IrqSPx vector_entry FiqSPx mov x0, #FIQ_SP_ELX bl plat_report_exception - b FiqSPx + bl plat_panic_handler check_vector_size FiqSPx vector_entry SErrorSPx mov x0, #SERROR_SP_ELX bl plat_report_exception - b SErrorSPx + bl plat_panic_handler check_vector_size SErrorSPx /* ----------------------------------------------------- @@ -120,19 +120,19 @@ vector_entry SynchronousExceptionA64 vector_entry IrqA64 mov x0, #IRQ_AARCH64 bl plat_report_exception - b IrqA64 + bl plat_panic_handler check_vector_size IrqA64 vector_entry FiqA64 mov x0, #FIQ_AARCH64 bl plat_report_exception - b FiqA64 + bl plat_panic_handler check_vector_size FiqA64 vector_entry SErrorA64 mov x0, #SERROR_AARCH64 bl plat_report_exception - b SErrorA64 + bl plat_panic_handler check_vector_size SErrorA64 /* ----------------------------------------------------- @@ -142,25 +142,25 @@ vector_entry SErrorA64 vector_entry SynchronousExceptionA32 mov x0, #SYNC_EXCEPTION_AARCH32 bl plat_report_exception - b SynchronousExceptionA32 + bl plat_panic_handler check_vector_size SynchronousExceptionA32 vector_entry IrqA32 mov x0, #IRQ_AARCH32 bl plat_report_exception - b IrqA32 + bl plat_panic_handler check_vector_size IrqA32 vector_entry FiqA32 mov x0, #FIQ_AARCH32 bl plat_report_exception - b FiqA32 + bl plat_panic_handler check_vector_size FiqA32 vector_entry SErrorA32 mov x0, #SERROR_AARCH32 bl plat_report_exception - b SErrorA32 + bl plat_panic_handler check_vector_size SErrorA32 @@ -231,8 +231,7 @@ endfunc smc_handler64 unexpected_sync_exception: mov x0, #SYNC_EXCEPTION_AARCH64 bl plat_report_exception - wfi - b unexpected_sync_exception + bl plat_panic_handler /* ----------------------------------------------------- * Save Secure/Normal world context and jump to |