diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-05-31 11:38:33 +0100 |
|---|---|---|
| committer | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-06-07 14:34:45 +0100 |
| commit | 2b91536625f9f740a49dfaa784b0544aadf787f8 (patch) | |
| tree | 508d7644d2d27fe6c8b747c819f42e36fc89a4c3 /lib/cpus/aarch64/wa_cve_2017_5715_mmu.S | |
| parent | d003b190938fa9e50ad351015da4b5225c78ce14 (diff) | |
Fast path SMCCC_ARCH_WORKAROUND_1 calls from AArch32
When SMCCC_ARCH_WORKAROUND_1 is invoked from a lower EL running in
AArch32 state, ensure that the SMC call will take a shortcut in EL3.
This minimizes the time it takes to apply the mitigation in EL3.
When lower ELs run in AArch32, it is preferred that they execute the
`BPIALL` instruction to invalidate the BTB. However, on some cores
the `BPIALL` instruction may be a no-op and thus would benefit from
making the SMCCC_ARCH_WORKAROUND_1 call go through the fast path.
Change-Id: Ia38abd92efe2c4b4a8efa7b70f260e43c5bda8a5
Signed-off-by: Dimitris Papastamos <dimitris.papastamos@arm.com>
Diffstat (limited to 'lib/cpus/aarch64/wa_cve_2017_5715_mmu.S')
| -rw-r--r-- | lib/cpus/aarch64/wa_cve_2017_5715_mmu.S | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/lib/cpus/aarch64/wa_cve_2017_5715_mmu.S b/lib/cpus/aarch64/wa_cve_2017_5715_mmu.S index 039e373c1..a556d1fee 100644 --- a/lib/cpus/aarch64/wa_cve_2017_5715_mmu.S +++ b/lib/cpus/aarch64/wa_cve_2017_5715_mmu.S @@ -12,10 +12,11 @@ .globl wa_cve_2017_5715_mmu_vbar #define ESR_EL3_A64_SMC0 0x5e000000 +#define ESR_EL3_A32_SMC0 0x4e000000 vector_base wa_cve_2017_5715_mmu_vbar - .macro apply_cve_2017_5715_wa _is_sync_exception + .macro apply_cve_2017_5715_wa _is_sync_exception _esr_el3_val stp x0, x1, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X0] mrs x1, sctlr_el3 /* Disable MMU */ @@ -32,7 +33,7 @@ vector_base wa_cve_2017_5715_mmu_vbar */ /* - * Ensure SMC is coming from A64 state on #0 + * Ensure SMC is coming from A64/A32 state on #0 * with W0 = SMCCC_ARCH_WORKAROUND_1 * * This sequence evaluates as: @@ -43,7 +44,7 @@ vector_base wa_cve_2017_5715_mmu_vbar orr w1, wzr, #SMCCC_ARCH_WORKAROUND_1 cmp w0, w1 mrs x0, esr_el3 - mov_imm w1, ESR_EL3_A64_SMC0 + mov_imm w1, \_esr_el3_val ccmp w0, w1, #0, eq /* Static predictor will predict a fall through */ bne 1f @@ -104,22 +105,22 @@ vector_entry mmu_serror_sp_elx * --------------------------------------------------------------------- */ vector_entry mmu_sync_exception_aarch64 - apply_cve_2017_5715_wa _is_sync_exception=1 + apply_cve_2017_5715_wa _is_sync_exception=1 _esr_el3_val=ESR_EL3_A64_SMC0 b sync_exception_aarch64 check_vector_size mmu_sync_exception_aarch64 vector_entry mmu_irq_aarch64 - apply_cve_2017_5715_wa _is_sync_exception=0 + apply_cve_2017_5715_wa _is_sync_exception=0 _esr_el3_val=ESR_EL3_A64_SMC0 b irq_aarch64 check_vector_size mmu_irq_aarch64 vector_entry mmu_fiq_aarch64 - apply_cve_2017_5715_wa _is_sync_exception=0 + apply_cve_2017_5715_wa _is_sync_exception=0 _esr_el3_val=ESR_EL3_A64_SMC0 b fiq_aarch64 check_vector_size mmu_fiq_aarch64 vector_entry mmu_serror_aarch64 - apply_cve_2017_5715_wa _is_sync_exception=0 + apply_cve_2017_5715_wa _is_sync_exception=0 _esr_el3_val=ESR_EL3_A64_SMC0 b serror_aarch64 check_vector_size mmu_serror_aarch64 @@ -128,21 +129,21 @@ vector_entry mmu_serror_aarch64 * --------------------------------------------------------------------- */ vector_entry mmu_sync_exception_aarch32 - apply_cve_2017_5715_wa _is_sync_exception=1 + apply_cve_2017_5715_wa _is_sync_exception=1 _esr_el3_val=ESR_EL3_A32_SMC0 b sync_exception_aarch32 check_vector_size mmu_sync_exception_aarch32 vector_entry mmu_irq_aarch32 - apply_cve_2017_5715_wa _is_sync_exception=0 + apply_cve_2017_5715_wa _is_sync_exception=0 _esr_el3_val=ESR_EL3_A32_SMC0 b irq_aarch32 check_vector_size mmu_irq_aarch32 vector_entry mmu_fiq_aarch32 - apply_cve_2017_5715_wa _is_sync_exception=0 + apply_cve_2017_5715_wa _is_sync_exception=0 _esr_el3_val=ESR_EL3_A32_SMC0 b fiq_aarch32 check_vector_size mmu_fiq_aarch32 vector_entry mmu_serror_aarch32 - apply_cve_2017_5715_wa _is_sync_exception=0 + apply_cve_2017_5715_wa _is_sync_exception=0 _esr_el3_val=ESR_EL3_A32_SMC0 b serror_aarch32 check_vector_size mmu_serror_aarch32 |