diff options
Diffstat (limited to 'src/arch/arm64/include')
| -rw-r--r-- | src/arch/arm64/include/arch/transition.h | 12 | ||||
| -rw-r--r-- | src/arch/arm64/include/armv8/arch/lib_helpers.h | 265 |
2 files changed, 5 insertions, 272 deletions
diff --git a/src/arch/arm64/include/arch/transition.h b/src/arch/arm64/include/arch/transition.h index 5cd73c15d8..290265edb0 100644 --- a/src/arch/arm64/include/arch/transition.h +++ b/src/arch/arm64/include/arch/transition.h @@ -163,16 +163,10 @@ static inline uint8_t get_mode_from_spsr(uint64_t spsr) */ /* - * User of transition library can make a call to transition_with_entry and pass - * the entry point and its argument which are put into elr and x0 by this - * function. After that it makes a call to transition. + * Transitions to EL2 with given entry point and argument in X0. SPSR can be + * partially configured, but the exception level given must be EL2. */ -void transition_with_entry(void *entry, void *arg, struct exc_state *exc_state); -/* - * transition function sets up all the registers as per the struct elx_state - * before jumping to trans_switch. - */ -void transition(struct exc_state *exc_state); +void transition_to_el2(void *entry, void *arg, uint64_t spsr); /* * exc_exit it called while returning from an exception. It expects pointer to diff --git a/src/arch/arm64/include/armv8/arch/lib_helpers.h b/src/arch/arm64/include/armv8/arch/lib_helpers.h index d2d30e12aa..e810098490 100644 --- a/src/arch/arm64/include/armv8/arch/lib_helpers.h +++ b/src/arch/arm64/include/armv8/arch/lib_helpers.h @@ -136,210 +136,17 @@ #define CPACR_TRAP_FP_EL0 (1 << CPACR_FPEN_SHIFT) #define CPACR_TRAP_FP_DISABLE (3 << CPACR_FPEN_SHIFT) -#ifdef __ASSEMBLER__ - -/* Macro to switch to label based on current el */ -.macro switch_el xreg label1 label2 label3 - mrs \xreg, CurrentEL - /* Currently at EL1 */ - cmp \xreg, #(EL1 << CURRENT_EL_SHIFT) - b.eq \label1 - /* Currently at EL2 */ - cmp \xreg, #(EL2 << CURRENT_EL_SHIFT) - b.eq \label2 - /* Currently at EL3 */ - cmp \xreg, #(EL3 << CURRENT_EL_SHIFT) - b.eq \label3 -.endm - -/* Macro to read sysreg at current EL - xreg - reg in which read value needs to be stored - sysreg - system reg that is to be read -*/ -.macro read_current xreg sysreg - switch_el \xreg, 101f, 102f, 103f -101: - mrs \xreg, \sysreg\()_el1 - b 104f -102: - mrs \xreg, \sysreg\()_el2 - b 104f -103: - mrs \xreg, \sysreg\()_el3 - b 104f -104: -.endm - -/* Macro to write sysreg at current EL - xreg - reg from which value needs to be written - sysreg - system reg that is to be written - temp - temp reg that can be used to read current EL -*/ -.macro write_current sysreg xreg temp - switch_el \temp, 101f, 102f, 103f -101: - msr \sysreg\()_el1, \xreg - b 104f -102: - msr \sysreg\()_el2, \xreg - b 104f -103: - msr \sysreg\()_el3, \xreg - b 104f -104: -.endm - -/* Macro to read sysreg at current EL - 1 - xreg - reg in which read value needs to be stored - sysreg - system reg that is to be read -*/ -.macro read_lower xreg sysreg - switch_el \xreg, 101f, 102f, 103f -101: - b 104f -102: - mrs \xreg, \sysreg\()_el1 - b 104f -103: - mrs \xreg, \sysreg\()_el2 - b 104f -104: -.endm - -/* Macro to write sysreg at current EL - 1 - xreg - reg from which value needs to be written - sysreg - system reg that is to be written - temp - temp reg that can be used to read current EL -*/ -.macro write_lower sysreg xreg temp - switch_el \temp, 101f, 102f, 103f -101: - b 104f -102: - msr \sysreg\()_el1, \xreg - b 104f -103: - msr \sysreg\()_el2, \xreg - b 104f -104: -.endm - -/* Macro to read from a register at EL3 only if we are currently at that - level. This is required to ensure that we do not attempt to read registers - from a level lower than el3. e.g. SCR is available for read only at EL3. - IMPORTANT: if EL != EL3, macro silently doesn't perform the read. -*/ -.macro read_el3 xreg sysreg - switch_el \xreg, 402f, 402f, 401f -401: - mrs \xreg, \sysreg\()_el3 -402: -.endm - -/* Macro to write to a register at EL3 only if we are currently at that - level. This is required to ensure that we do not attempt to write to - registers from a level lower than el3. e.g. SCR is available to write only at - EL3. - IMPORTANT: if EL != EL3, macro silently doesn't perform the write. -*/ -.macro write_el3 sysreg xreg temp - switch_el \temp, 402f, 402f, 401f -401: - msr \sysreg\()_el3, \xreg -402: -.endm - -/* Macro to read from an el1 register */ -.macro read_el1 xreg sysreg - mrs \xreg, \sysreg\()_el1 -.endm - -/* Macro to write to an el1 register */ -.macro write_el1 sysreg xreg temp - msr \sysreg\()_el1, \xreg -.endm - -/* Macro to read from an el0 register */ -.macro read_el0 xreg sysreg - mrs \xreg, \sysreg\()_el0 -.endm - -/* Macro to write to an el0 register */ -.macro write_el0 sysreg xreg temp - msr \sysreg\()_el0, \xreg -.endm - -/* Macro to invalidate all stage 1 TLB entries for current EL */ -.macro tlbiall_current temp - switch_el \temp, 401f, 402f, 403f -401: - tlbi alle1 - b 404f -402: - tlbi alle2 - b 404f -403: - tlbi alle3 - b 404f -404: -.endm - -#else - -#include <stdint.h> - #define DAIF_DBG_BIT (1<<3) #define DAIF_ABT_BIT (1<<2) #define DAIF_IRQ_BIT (1<<1) #define DAIF_FIQ_BIT (1<<0) -#define SWITCH_CASE_READ(func, var, type, el) do { \ - type var = -1; \ - switch(el) { \ - case EL1: \ - var = func##_el1(); \ - break; \ - case EL2: \ - var = func##_el2(); \ - break; \ - case EL3: \ - var = func##_el3(); \ - break; \ - } \ - return var; \ - } while (0) +#ifndef __ASSEMBLER__ -#define SWITCH_CASE_WRITE(func, var, el) do { \ - switch(el) { \ - case EL1: \ - func##_el1(var); \ - break; \ - case EL2: \ - func##_el2(var); \ - break; \ - case EL3: \ - func##_el3(var); \ - break; \ - } \ - } while (0) - -#define SWITCH_CASE_TLBI(func, el) do { \ - switch(el) { \ - case EL1: \ - func##_el1(); \ - break; \ - case EL2: \ - func##_el2(); \ - break; \ - case EL3: \ - func##_el3(); \ - break; \ - } \ - } while (0) +#include <stdint.h> /* PSTATE and special purpose register access functions */ uint32_t raw_read_current_el(void); -uint32_t get_current_el(void); uint32_t raw_read_daif(void); void raw_write_daif(uint32_t daif); void enable_debug_exceptions(void); @@ -360,10 +167,6 @@ uint64_t raw_read_elr_el2(void); void raw_write_elr_el2(uint64_t elr_el2); uint64_t raw_read_elr_el3(void); void raw_write_elr_el3(uint64_t elr_el3); -uint64_t raw_read_elr_current(void); -void raw_write_elr_current(uint64_t elr); -uint64_t raw_read_elr(uint32_t el); -void raw_write_elr(uint64_t elr, uint32_t el); uint32_t raw_read_fpcr(void); void raw_write_fpcr(uint32_t fpcr); uint32_t raw_read_fpsr(void); @@ -380,8 +183,6 @@ uint32_t raw_read_spsel(void); void raw_write_spsel(uint32_t spsel); uint64_t raw_read_sp_el3(void); void raw_write_sp_el3(uint64_t sp_el3); -uint64_t raw_read_sp_elx(uint32_t el); -void raw_write_sp_elx(uint64_t sp_elx, uint32_t el); uint32_t raw_read_spsr_abt(void); void raw_write_spsr_abt(uint32_t spsr_abt); uint32_t raw_read_spsr_el1(void); @@ -390,10 +191,6 @@ uint32_t raw_read_spsr_el2(void); void raw_write_spsr_el2(uint32_t spsr_el2); uint32_t raw_read_spsr_el3(void); void raw_write_spsr_el3(uint32_t spsr_el3); -uint32_t raw_read_spsr_current(void); -void raw_write_spsr_current(uint32_t spsr); -uint32_t raw_read_spsr(uint32_t el); -void raw_write_spsr(uint32_t spsr, uint32_t el); uint32_t raw_read_spsr_fiq(void); void raw_write_spsr_fiq(uint32_t spsr_fiq); uint32_t raw_read_spsr_irq(void); @@ -408,30 +205,18 @@ uint32_t raw_read_actlr_el2(void); void raw_write_actlr_el2(uint32_t actlr_el2); uint32_t raw_read_actlr_el3(void); void raw_write_actlr_el3(uint32_t actlr_el3); -uint32_t raw_read_actlr_current(void); -void raw_write_actlr_current(uint32_t actlr); -uint32_t raw_read_actlr(uint32_t el); -void raw_write_actlr(uint32_t actlr, uint32_t el); uint32_t raw_read_afsr0_el1(void); void raw_write_afsr0_el1(uint32_t afsr0_el1); uint32_t raw_read_afsr0_el2(void); void raw_write_afsr0_el2(uint32_t afsr0_el2); uint32_t raw_read_afsr0_el3(void); void raw_write_afsr0_el3(uint32_t afsr0_el3); -uint32_t raw_read_afsr0_current(void); -void raw_write_afsr0_current(uint32_t afsr0); -uint32_t raw_read_afsr0(uint32_t el); -void raw_write_afsr0(uint32_t afsr0, uint32_t el); uint32_t raw_read_afsr1_el1(void); void raw_write_afsr1_el1(uint32_t afsr1_el1); uint32_t raw_read_afsr1_el2(void); void raw_write_afsr1_el2(uint32_t afsr1_el2); uint32_t raw_read_afsr1_el3(void); void raw_write_afsr1_el3(uint32_t afsr1_el3); -uint32_t raw_read_afsr1_current(void); -void raw_write_afsr1_current(uint32_t afsr1); -uint32_t raw_read_afsr1(uint32_t el); -void raw_write_afsr1(uint32_t afsr1, uint32_t el); uint32_t raw_read_aidr_el1(void); uint64_t raw_read_amair_el1(void); void raw_write_amair_el1(uint64_t amair_el1); @@ -439,10 +224,6 @@ uint64_t raw_read_amair_el2(void); void raw_write_amair_el2(uint64_t amair_el2); uint64_t raw_read_amair_el3(void); void raw_write_amair_el3(uint64_t amair_el3); -uint64_t raw_read_amair_current(void); -void raw_write_amair_current(uint64_t amair); -uint64_t raw_read_amair(uint32_t el); -void raw_write_amair(uint64_t amair, uint32_t el); uint32_t raw_read_ccsidr_el1(void); uint32_t raw_read_clidr_el1(void); uint32_t raw_read_cpacr_el1(void); @@ -451,8 +232,6 @@ uint32_t raw_read_cptr_el2(void); void raw_write_cptr_el2(uint32_t cptr_el2); uint32_t raw_read_cptr_el3(void); void raw_write_cptr_el3(uint32_t cptr_el3); -uint32_t raw_read_cptr_current(void); -void raw_write_cptr_current(uint32_t cptr); uint32_t raw_read_csselr_el1(void); void raw_write_csselr_el1(uint32_t csselr_el1); uint32_t raw_read_ctr_el0(void); @@ -462,20 +241,12 @@ uint32_t raw_read_esr_el2(void); void raw_write_esr_el2(uint32_t esr_el2); uint32_t raw_read_esr_el3(void); void raw_write_esr_el3(uint32_t esr_el3); -uint32_t raw_read_esr_current(void); -void raw_write_esr_current(uint32_t esr); -uint32_t raw_read_esr(uint32_t el); -void raw_write_esr(uint32_t esr, uint32_t el); uint64_t raw_read_far_el1(void); void raw_write_far_el1(uint64_t far_el1); uint64_t raw_read_far_el2(void); void raw_write_far_el2(uint64_t far_el2); uint64_t raw_read_far_el3(void); void raw_write_far_el3(uint64_t far_el3); -uint64_t raw_read_far_current(void); -void raw_write_far_current(uint64_t far); -uint64_t raw_read_far(uint32_t el); -void raw_write_far(uint64_t far, uint32_t el); uint64_t raw_read_hcr_el2(void); void raw_write_hcr_el2(uint64_t hcr_el2); uint64_t raw_read_aa64pfr0_el1(void); @@ -485,10 +256,6 @@ uint64_t raw_read_mair_el2(void); void raw_write_mair_el2(uint64_t mair_el2); uint64_t raw_read_mair_el3(void); void raw_write_mair_el3(uint64_t mair_el3); -uint64_t raw_read_mair_current(void); -void raw_write_mair_current(uint64_t mair); -uint64_t raw_read_mair(uint32_t el); -void raw_write_mair(uint64_t mair, uint32_t el); uint32_t raw_read_midr_el1(void); uint64_t raw_read_mpidr_el1(void); uint32_t raw_read_rmr_el1(void); @@ -497,20 +264,12 @@ uint32_t raw_read_rmr_el2(void); void raw_write_rmr_el2(uint32_t rmr_el2); uint32_t raw_read_rmr_el3(void); void raw_write_rmr_el3(uint32_t rmr_el3); -uint32_t raw_read_rmr_current(void); -void raw_write_rmr_current(uint32_t rmr); -uint32_t raw_read_rmr(uint32_t el); -void raw_write_rmr(uint32_t rmr, uint32_t el); uint64_t raw_read_rvbar_el1(void); void raw_write_rvbar_el1(uint64_t rvbar_el1); uint64_t raw_read_rvbar_el2(void); void raw_write_rvbar_el2(uint64_t rvbar_el2); uint64_t raw_read_rvbar_el3(void); void raw_write_rvbar_el3(uint64_t rvbar_el3); -uint64_t raw_read_rvbar_current(void); -void raw_write_rvbar_current(uint64_t rvbar); -uint64_t raw_read_rvbar(uint32_t el); -void raw_write_rvbar(uint64_t rvbar, uint32_t el); uint32_t raw_read_scr_el3(void); void raw_write_scr_el3(uint32_t scr_el3); uint32_t raw_read_sctlr_el1(void); @@ -519,30 +278,18 @@ uint32_t raw_read_sctlr_el2(void); void raw_write_sctlr_el2(uint32_t sctlr_el2); uint32_t raw_read_sctlr_el3(void); void raw_write_sctlr_el3(uint32_t sctlr_el3); -uint32_t raw_read_sctlr_current(void); -void raw_write_sctlr_current(uint32_t sctlr); -uint32_t raw_read_sctlr(uint32_t el); -void raw_write_sctlr(uint32_t sctlr, uint32_t el); uint64_t raw_read_tcr_el1(void); void raw_write_tcr_el1(uint64_t tcr_el1); uint32_t raw_read_tcr_el2(void); void raw_write_tcr_el2(uint32_t tcr_el2); uint32_t raw_read_tcr_el3(void); void raw_write_tcr_el3(uint32_t tcr_el3); -uint64_t raw_read_tcr_current(void); -void raw_write_tcr_current(uint64_t tcr); -uint64_t raw_read_tcr(uint32_t el); -void raw_write_tcr(uint64_t tcr, uint32_t el); uint64_t raw_read_ttbr0_el1(void); void raw_write_ttbr0_el1(uint64_t ttbr0_el1); uint64_t raw_read_ttbr0_el2(void); void raw_write_ttbr0_el2(uint64_t ttbr0_el2); uint64_t raw_read_ttbr0_el3(void); void raw_write_ttbr0_el3(uint64_t ttbr0_el3); -uint64_t raw_read_ttbr0_current(void); -void raw_write_ttbr0_current(uint64_t ttbr0); -uint64_t raw_read_ttbr0(uint32_t el); -void raw_write_ttbr0(uint64_t ttbr0, uint32_t el); uint64_t raw_read_ttbr1_el1(void); void raw_write_ttbr1_el1(uint64_t ttbr1_el1); uint64_t raw_read_vbar_el1(void); @@ -551,10 +298,6 @@ uint64_t raw_read_vbar_el2(void); void raw_write_vbar_el2(uint64_t vbar_el2); uint64_t raw_read_vbar_el3(void); void raw_write_vbar_el3(uint64_t vbar_el3); -uint64_t raw_read_vbar_current(void); -void raw_write_vbar_current(uint64_t vbar); -uint64_t raw_read_vbar(uint32_t el); -void raw_write_vbar(uint64_t vbar, uint32_t el); uint32_t raw_read_cntfrq_el0(void); void raw_write_cntfrq_el0(uint32_t cntfrq_el0); uint64_t raw_read_cntpct_el0(void); @@ -576,13 +319,9 @@ void icivau(uint64_t ivau); void tlbiall_el1(void); void tlbiall_el2(void); void tlbiall_el3(void); -void tlbiall_current(void); -void tlbiall(uint32_t el); void tlbiallis_el1(void); void tlbiallis_el2(void); void tlbiallis_el3(void); -void tlbiallis_current(void); -void tlbiallis(uint32_t el); void tlbivaa_el1(uint64_t va); #endif /* __ASSEMBLER__ */ |