mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-16 09:34:18 +00:00
Separate out BL2, BL3-1 and BL3-2 early exception vectors from BL1
bl1/aarch64/early_exceptions.S used to be re-used by BL2, BL3-1 and BL3-2. There was some early SMC handling code in there that was not required by the other bootloader stages. Therefore this patch introduces an even simpler exception vector source file for BL2, BL3-1 and BL3-2. Fixes ARM-software/tf-issues#38 Change-Id: I0244b80e9930b0f8035156a0bf91cc3e9a8f995d
This commit is contained in:
Sandrine Bailleux
Dan Handley
parent
d8b07aa03f
commit
6c595b3d11
7 changed files with 183 additions and 20 deletions
|
|
@ -54,7 +54,7 @@ bl1_entrypoint: ; .type bl1_entrypoint, %function
|
|||
* Set the exception vector to something sane.
|
||||
* ---------------------------------------------
|
||||
*/
|
||||
adr x0, early_exceptions
|
||||
adr x0, bl1_exceptions
|
||||
msr vbar_el3, x0
|
||||
|
||||
/* ---------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -35,19 +35,16 @@
|
|||
#include <runtime_svc.h>
|
||||
#include <asm_macros.S>
|
||||
|
||||
.globl early_exceptions
|
||||
.weak display_boot_progress
|
||||
.globl bl1_exceptions
|
||||
|
||||
.section .vectors, "ax"; .align 11
|
||||
|
||||
/* -----------------------------------------------------
|
||||
* Very simple stackless exception handlers used by all
|
||||
* bootloader stages. BL31 uses them before stacks are
|
||||
* setup. BL1/BL2 use them throughout.
|
||||
* Very simple stackless exception handlers used by BL1.
|
||||
* -----------------------------------------------------
|
||||
*/
|
||||
.align 7
|
||||
early_exceptions:
|
||||
bl1_exceptions:
|
||||
/* -----------------------------------------------------
|
||||
* Current EL with SP0 : 0x0 - 0x180
|
||||
* -----------------------------------------------------
|
||||
|
|
@ -241,14 +238,3 @@ skip_mmu_teardown:
|
|||
panic:
|
||||
wfi
|
||||
b panic
|
||||
|
||||
/* -----------------------------------------------------
|
||||
* BL1 redefines this function to print the fact that
|
||||
* BL2 has done its job and BL31 is about to be loaded.
|
||||
* This weak definition allows other bootloader stages
|
||||
* to use the 'early_exceptions' without running into
|
||||
* compilation errors.
|
||||
* -----------------------------------------------------
|
||||
*/
|
||||
display_boot_progress:
|
||||
ret
|
||||
|
|
@ -45,7 +45,7 @@ vpath %.S arch/${ARCH}/cpu \
|
|||
|
||||
BL1_SOURCES += bl1_arch_setup.c \
|
||||
bl1_entrypoint.S \
|
||||
early_exceptions.S \
|
||||
bl1_exceptions.S \
|
||||
bl1_main.c \
|
||||
cpu_helpers.S
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ vpath %.c common \
|
|||
vpath %.S lib/arch/${ARCH} \
|
||||
include \
|
||||
lib/sync/locks/exclusive \
|
||||
common/${ARCH} \
|
||||
${PLAT_BL2_S_VPATH}
|
||||
|
||||
BL2_SOURCES += bl2_entrypoint.S \
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ vpath %.S lib/arch/${ARCH} \
|
|||
lib/sync/locks/exclusive \
|
||||
plat/common/${ARCH} \
|
||||
arch/system/gic/${ARCH} \
|
||||
common/${ARCH} \
|
||||
${PLAT_BL31_S_VPATH}
|
||||
|
||||
BL31_SOURCES += bl31_arch_setup.c \
|
||||
|
|
|
|||
|
|
@ -36,7 +36,8 @@ vpath %.c common \
|
|||
|
||||
vpath %.S lib/arch/${ARCH} \
|
||||
include \
|
||||
lib/sync/locks/exclusive
|
||||
lib/sync/locks/exclusive \
|
||||
common/${ARCH}
|
||||
|
||||
BL32_SOURCES += tsp_entrypoint.S \
|
||||
tsp_main.c \
|
||||
|
|
|
|||
174
common/aarch64/early_exceptions.S
Normal file
174
common/aarch64/early_exceptions.S
Normal file
|
|
@ -0,0 +1,174 @@
|
|||
/*
|
||||
* Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
*
|
||||
* Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* Neither the name of ARM nor the names of its contributors may be used
|
||||
* to endorse or promote products derived from this software without specific
|
||||
* prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <arch.h>
|
||||
#include <bl_common.h>
|
||||
#include <platform.h>
|
||||
#include <runtime_svc.h>
|
||||
#include <asm_macros.S>
|
||||
|
||||
.globl early_exceptions
|
||||
|
||||
.section .vectors, "ax"; .align 11
|
||||
|
||||
/* -----------------------------------------------------
|
||||
* Very simple stackless exception handlers used by BL2
|
||||
* and BL3-1 bootloader stages. BL3-1 uses them before
|
||||
* stacks are setup. BL2 uses them throughout.
|
||||
* -----------------------------------------------------
|
||||
*/
|
||||
.align 7
|
||||
early_exceptions:
|
||||
/* -----------------------------------------------------
|
||||
* Current EL with SP0 : 0x0 - 0x180
|
||||
* -----------------------------------------------------
|
||||
*/
|
||||
SynchronousExceptionSP0:
|
||||
mov x0, #SYNC_EXCEPTION_SP_EL0
|
||||
bl plat_report_exception
|
||||
b SynchronousExceptionSP0
|
||||
check_vector_size SynchronousExceptionSP0
|
||||
|
||||
.align 7
|
||||
IrqSP0:
|
||||
mov x0, #IRQ_SP_EL0
|
||||
bl plat_report_exception
|
||||
b IrqSP0
|
||||
check_vector_size IrqSP0
|
||||
|
||||
.align 7
|
||||
FiqSP0:
|
||||
mov x0, #FIQ_SP_EL0
|
||||
bl plat_report_exception
|
||||
b FiqSP0
|
||||
check_vector_size FiqSP0
|
||||
|
||||
.align 7
|
||||
SErrorSP0:
|
||||
mov x0, #SERROR_SP_EL0
|
||||
bl plat_report_exception
|
||||
b SErrorSP0
|
||||
check_vector_size SErrorSP0
|
||||
|
||||
/* -----------------------------------------------------
|
||||
* Current EL with SPx: 0x200 - 0x380
|
||||
* -----------------------------------------------------
|
||||
*/
|
||||
.align 7
|
||||
SynchronousExceptionSPx:
|
||||
mov x0, #SYNC_EXCEPTION_SP_ELX
|
||||
bl plat_report_exception
|
||||
b SynchronousExceptionSPx
|
||||
check_vector_size SynchronousExceptionSPx
|
||||
|
||||
.align 7
|
||||
IrqSPx:
|
||||
mov x0, #IRQ_SP_ELX
|
||||
bl plat_report_exception
|
||||
b IrqSPx
|
||||
check_vector_size IrqSPx
|
||||
|
||||
.align 7
|
||||
FiqSPx:
|
||||
mov x0, #FIQ_SP_ELX
|
||||
bl plat_report_exception
|
||||
b FiqSPx
|
||||
check_vector_size FiqSPx
|
||||
|
||||
.align 7
|
||||
SErrorSPx:
|
||||
mov x0, #SERROR_SP_ELX
|
||||
bl plat_report_exception
|
||||
b SErrorSPx
|
||||
check_vector_size SErrorSPx
|
||||
|
||||
/* -----------------------------------------------------
|
||||
* Lower EL using AArch64 : 0x400 - 0x580
|
||||
* -----------------------------------------------------
|
||||
*/
|
||||
.align 7
|
||||
SynchronousExceptionA64:
|
||||
mov x0, #SYNC_EXCEPTION_AARCH64
|
||||
bl plat_report_exception
|
||||
b SynchronousExceptionA64
|
||||
check_vector_size SynchronousExceptionA64
|
||||
|
||||
.align 7
|
||||
IrqA64:
|
||||
mov x0, #IRQ_AARCH64
|
||||
bl plat_report_exception
|
||||
b IrqA64
|
||||
check_vector_size IrqA64
|
||||
|
||||
.align 7
|
||||
FiqA64:
|
||||
mov x0, #FIQ_AARCH64
|
||||
bl plat_report_exception
|
||||
b FiqA64
|
||||
check_vector_size FiqA64
|
||||
|
||||
.align 7
|
||||
SErrorA64:
|
||||
mov x0, #SERROR_AARCH64
|
||||
bl plat_report_exception
|
||||
b SErrorA64
|
||||
check_vector_size SErrorA64
|
||||
|
||||
/* -----------------------------------------------------
|
||||
* Lower EL using AArch32 : 0x0 - 0x180
|
||||
* -----------------------------------------------------
|
||||
*/
|
||||
.align 7
|
||||
SynchronousExceptionA32:
|
||||
mov x0, #SYNC_EXCEPTION_AARCH32
|
||||
bl plat_report_exception
|
||||
b SynchronousExceptionA32
|
||||
check_vector_size SynchronousExceptionA32
|
||||
|
||||
.align 7
|
||||
IrqA32:
|
||||
mov x0, #IRQ_AARCH32
|
||||
bl plat_report_exception
|
||||
b IrqA32
|
||||
check_vector_size IrqA32
|
||||
|
||||
.align 7
|
||||
FiqA32:
|
||||
mov x0, #FIQ_AARCH32
|
||||
bl plat_report_exception
|
||||
b FiqA32
|
||||
check_vector_size FiqA32
|
||||
|
||||
.align 7
|
||||
SErrorA32:
|
||||
mov x0, #SERROR_AARCH32
|
||||
bl plat_report_exception
|
||||
b SErrorA32
|
||||
check_vector_size SErrorA32
|
||||
Loading…
Add table
Reference in a new issue