wellton/magenta
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

[arm64] Prefix EL1 exception functions with "el1".

Ver Código-Fonte 
This is to disambiguate them from the EL2 exception functions that
will be used with the hypervisor.

Change-Id: Ia679397f31fc0410ef3f267a759ff80d44ab18b9
Esse commit está contido em:
Abdulla Kamar
2017-09-11 14:10:29 +10:00
pai 776d4eed1b
commit 028c7e3ea6
3 arquivos alterados com 37 adições e 36 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
kernel/arch/arm64/arch.cpp
+1 -1
Ver Arquivo
@@ -185,7 +185,7 @@ static void arm64_cpu_early_init(void)
ASSERT( (mmfr0 & ARM64_MMFR0_ASIDBITS_MASK) == ARM64_MMFR0_ASIDBITS_16);
/* set the vector base */
ARM64_WRITE_SYSREG(VBAR_EL1, (uint64_t)&arm64_exception_base);
ARM64_WRITE_SYSREG(VBAR_EL1, (uint64_t)&arm64_el1_exception_base);
/* set some control bits in sctlr */
uint64_t sctlr = ARM64_READ_SYSREG(sctlr_el1);
kernel/arch/arm64/exceptions.S
+35 -34
Ver Arquivo
@@ -11,7 +11,7 @@
#include <arch/arm64.h>
#include <arch/arm64/exceptions.h>
.section .text.boot.vectab,"ax",@progbits
.section .text.boot.vectab.el1,"ax",@progbits
.align 12
#define DW_REG_lr 30
@@ -248,102 +248,103 @@ mark_lr_sp_inaccessible
b arm64_exc_shared_restore_long
.endm
FUNCTION_LABEL(arm64_exception_base)
FUNCTION_LABEL(arm64_el1_exception_base)
/* exceptions from current EL, using SP0 */
LOCAL_FUNCTION_LABEL(arm64_sync_exc_current_el_SP0)
.org 0x000
LOCAL_FUNCTION_LABEL(arm64_el1_sync_exc_current_el_SP0)
invalid_exception 0
END_FUNCTION(arm64_sync_exc_current_el_SP0)
END_FUNCTION(arm64_el1_sync_exc_current_el_SP0)
.org 0x080
LOCAL_FUNCTION_LABEL(arm64_irq_current_el_SP0)
LOCAL_FUNCTION_LABEL(arm64_el1_irq_current_el_SP0)
invalid_exception 1
END_FUNCTION(arm64_irq_current_el_SP0)
END_FUNCTION(arm64_el1_irq_current_el_SP0)
.org 0x100
LOCAL_FUNCTION_LABEL(arm64_fiq_current_el_SP0)
LOCAL_FUNCTION_LABEL(arm64_el1_fiq_current_el_SP0)
invalid_exception 2
END_FUNCTION(arm64_fiq_current_el_SP0)
END_FUNCTION(arm64_el1_fiq_current_el_SP0)
.org 0x180
LOCAL_FUNCTION_LABEL(arm64_err_exc_current_el_SP0)
LOCAL_FUNCTION_LABEL(arm64_el1_err_exc_current_el_SP0)
invalid_exception 3
END_FUNCTION(arm64_err_exc_current_el_SP0)
END_FUNCTION(arm64_el1_err_exc_current_el_SP0)
/* exceptions from current EL, using SPx */
.org 0x200
LOCAL_FUNCTION_LABEL(arm64_sync_exc_current_el_SPx)
LOCAL_FUNCTION_LABEL(arm64_el1_sync_exc_current_el_SPx)
sync_exception #0 /* same EL, arm64 */
END_FUNCTION(arm64_sync_exc_current_el_SPx)
END_FUNCTION(arm64_el1_sync_exc_current_el_SPx)
.org 0x280
LOCAL_FUNCTION_LABEL(arm64_irq_current_el_SPx)
LOCAL_FUNCTION_LABEL(arm64_el1_irq_current_el_SPx)
irq_exception #0 /* same EL, arm64 */
END_FUNCTION(arm64_irq_current_el_SPx)
END_FUNCTION(arm64_el1_irq_current_el_SPx)
.org 0x300
LOCAL_FUNCTION_LABEL(arm64_fiq_current_el_SPx)
LOCAL_FUNCTION_LABEL(arm64_el1_fiq_current_el_SPx)
start_isr_func
regsave_short
mov x0, sp
bl platform_fiq
b arm64_exc_shared_restore_short
END_FUNCTION(arm64_fiq_current_el_SPx)
END_FUNCTION(arm64_el1_fiq_current_el_SPx)
.org 0x380
LOCAL_FUNCTION_LABEL(arm64_err_exc_current_el_SPx)
LOCAL_FUNCTION_LABEL(arm64_el1_err_exc_current_el_SPx)
invalid_exception 0x13
END_FUNCTION(arm64_err_exc_current_el_SPx)
END_FUNCTION(arm64_el1_err_exc_current_el_SPx)
/* exceptions from lower EL, running arm64 */
.org 0x400
LOCAL_FUNCTION_LABEL(arm64_sync_exc_lower_el_64)
LOCAL_FUNCTION_LABEL(arm64_el1_sync_exc_lower_el_64)
sync_exception #(ARM64_EXCEPTION_FLAG_LOWER_EL)
END_FUNCTION(arm64_sync_exc_lower_el_64)
END_FUNCTION(arm64_el1_sync_exc_lower_el_64)
.org 0x480
LOCAL_FUNCTION_LABEL(arm64_irq_lower_el_64)
LOCAL_FUNCTION_LABEL(arm64_el1_irq_lower_el_64)
irq_exception #(ARM64_EXCEPTION_FLAG_LOWER_EL)
END_FUNCTION(arm64_irq_lower_el_64)
END_FUNCTION(arm64_el1_irq_lower_el_64)
.org 0x500
LOCAL_FUNCTION_LABEL(arm64_fiq_lower_el_64)
LOCAL_FUNCTION_LABEL(arm64_el1_fiq_lower_el_64)
start_isr_func
regsave_short
mov x0, sp
bl platform_fiq
b arm64_exc_shared_restore_short
END_FUNCTION(arm64_fiq_lower_el_64)
END_FUNCTION(arm64_el1_fiq_lower_el_64)
.org 0x580
LOCAL_FUNCTION_LABEL(arm64_err_exc_lower_el_64)
LOCAL_FUNCTION_LABEL(arm64_el1_err_exc_lower_el_64)
invalid_exception 0x23
END_FUNCTION(arm64_err_exc_lower_el_64)
END_FUNCTION(arm64_el1_err_exc_lower_el_64)
/* exceptions from lower EL, running arm32 */
.org 0x600
LOCAL_FUNCTION_LABEL(arm64_sync_exc_lower_el_32)
LOCAL_FUNCTION_LABEL(arm64_el1_sync_exc_lower_el_32)
sync_exception #(ARM64_EXCEPTION_FLAG_LOWER_EL|ARM64_EXCEPTION_FLAG_ARM32)
END_FUNCTION(arm64_sync_exc_lower_el_32)
END_FUNCTION(arm64_el1_sync_exc_lower_el_32)
.org 0x680
LOCAL_FUNCTION_LABEL(arm64_irq_lower_el_32)
LOCAL_FUNCTION_LABEL(arm64_el1_irq_lower_el_32)
irq_exception #(ARM64_EXCEPTION_FLAG_LOWER_EL|ARM64_EXCEPTION_FLAG_ARM32)
END_FUNCTION(arm64_irq_lower_el_32)
END_FUNCTION(arm64_el1_irq_lower_el_32)
.org 0x700
LOCAL_FUNCTION_LABEL(arm64_fiq_lower_el_32)
LOCAL_FUNCTION_LABEL(arm64_el1_fiq_lower_el_32)
start_isr_func
regsave_short
mov x0, sp
bl platform_fiq
b arm64_exc_shared_restore_short
END_FUNCTION(arm64_fiq_lower_el_32)
END_FUNCTION(arm64_el1_fiq_lower_el_32)
.org 0x780
LOCAL_FUNCTION_LABEL(arm64_err_exc_lower_el_32)
LOCAL_FUNCTION_LABEL(arm64_el1_err_exc_lower_el_32)
invalid_exception 0x33
END_FUNCTION(arm64_err_exc_lower_el_32)
END_FUNCTION(arm64_el1_err_exc_lower_el_32)
/* If an IRQ happened in userspace, and either the thread was signaled or
needs to be rescheduled, then we end up here after arm64_irq returns.
kernel/arch/arm64/include/arch/arm64.h
+1 -1
Ver Arquivo
@@ -90,7 +90,7 @@ struct arch_exception_context {
};
struct thread;
extern void arm64_exception_base(void);
extern void arm64_el1_exception_base(void);
void arm64_el3_to_el1(void);
void arm64_sync_exception(struct arm64_iframe_long *iframe, uint exception_flags);