Skip to content

Commit 275fa0e

Browse files
Steven Pricewilldeacon
authored andcommitted
arm64: Workaround for Cortex-A55 erratum 1530923
Cortex-A55 erratum 1530923 allows TLB entries to be allocated as a result of a speculative AT instruction. This may happen in the middle of a guest world switch while the relevant VMSA configuration is in an inconsistent state, leading to erroneous content being allocated into TLBs. The same workaround as is used for Cortex-A76 erratum 1165522 (WORKAROUND_SPECULATIVE_AT_VHE) can be used here. Note that this mandates the use of VHE on affected parts. Acked-by: Marc Zyngier <[email protected]> Signed-off-by: Steven Price <[email protected]> Signed-off-by: Will Deacon <[email protected]>
1 parent db0d46a commit 275fa0e

File tree

6 files changed

+26
-7
lines changed

6 files changed

+26
-7
lines changed

Documentation/arm64/silicon-errata.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ stable kernels.
8888
+----------------+-----------------+-----------------+-----------------------------+
8989
| ARM | Cortex-A76 | #1463225 | ARM64_ERRATUM_1463225 |
9090
+----------------+-----------------+-----------------+-----------------------------+
91+
| ARM | Cortex-A55 | #1530923 | ARM64_ERRATUM_1530923 |
92+
+----------------+-----------------+-----------------+-----------------------------+
9193
| ARM | Neoverse-N1 | #1188873,1418040| ARM64_ERRATUM_1418040 |
9294
+----------------+-----------------+-----------------+-----------------------------+
9395
| ARM | Neoverse-N1 | #1349291 | N/A |

arch/arm64/Kconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,19 @@ config ARM64_ERRATUM_1165522
530530

531531
If unsure, say Y.
532532

533+
config ARM64_ERRATUM_1530923
534+
bool "Cortex-A55: Speculative AT instruction using out-of-context translation regime could cause subsequent request to generate an incorrect translation"
535+
default y
536+
select ARM64_WORKAROUND_SPECULATIVE_AT_VHE
537+
help
538+
This option adds a workaround for ARM Cortex-A55 erratum 1530923.
539+
540+
Affected Cortex-A55 cores (r0p0, r0p1, r1p0, r2p0) could end-up with
541+
corrupted TLBs by speculating an AT instruction during a guest
542+
context switch.
543+
544+
If unsure, say Y.
545+
533546
config ARM64_ERRATUM_1286807
534547
bool "Cortex-A76: Modification of the translation table for a virtual address might lead to read-after-read ordering violation"
535548
default y

arch/arm64/include/asm/kvm_hyp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ static __always_inline void __hyp_text __load_guest_stage2(struct kvm *kvm)
9191
write_sysreg(kvm_get_vttbr(kvm), vttbr_el2);
9292

9393
/*
94-
* ARM erratum 1165522 requires the actual execution of the above
95-
* before we can switch to the EL1/EL0 translation regime used by
94+
* ARM errata 1165522 and 1530923 require the actual execution of the
95+
* above before we can switch to the EL1/EL0 translation regime used by
9696
* the guest.
9797
*/
9898
asm(ALTERNATIVE("nop", "isb", ARM64_WORKAROUND_SPECULATIVE_AT_VHE));

arch/arm64/kernel/cpu_errata.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,10 @@ static const struct midr_range erratum_speculative_at_vhe_list[] = {
762762
#ifdef CONFIG_ARM64_ERRATUM_1165522
763763
/* Cortex A76 r0p0 to r2p0 */
764764
MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 2, 0),
765+
#endif
766+
#ifdef CONFIG_ARM64_ERRATUM_1530923
767+
/* Cortex A55 r0p0 to r2p0 */
768+
MIDR_RANGE(MIDR_CORTEX_A55, 0, 0, 2, 0),
765769
#endif
766770
{},
767771
};
@@ -895,7 +899,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
895899
#endif
896900
#ifdef CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT_VHE
897901
{
898-
.desc = "ARM erratum 1165522",
902+
.desc = "ARM errata 1165522, 1530923",
899903
.capability = ARM64_WORKAROUND_SPECULATIVE_AT_VHE,
900904
ERRATA_MIDR_RANGE_LIST(erratum_speculative_at_vhe_list),
901905
},

arch/arm64/kvm/hyp/switch.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ static void deactivate_traps_vhe(void)
158158
write_sysreg(HCR_HOST_VHE_FLAGS, hcr_el2);
159159

160160
/*
161-
* ARM erratum 1165522 requires the actual execution of the above
162-
* before we can switch to the EL2/EL0 translation regime used by
161+
* ARM errata 1165522 and 1530923 require the actual execution of the
162+
* above before we can switch to the EL2/EL0 translation regime used by
163163
* the host.
164164
*/
165165
asm(ALTERNATIVE("nop", "isb", ARM64_WORKAROUND_SPECULATIVE_AT_VHE));

arch/arm64/kvm/hyp/tlb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ static void __hyp_text __tlb_switch_to_guest_vhe(struct kvm *kvm,
2525

2626
if (cpus_have_const_cap(ARM64_WORKAROUND_SPECULATIVE_AT_VHE)) {
2727
/*
28-
* For CPUs that are affected by ARM erratum 1165522, we
29-
* cannot trust stage-1 to be in a correct state at that
28+
* For CPUs that are affected by ARM errata 1165522 or 1530923,
29+
* we cannot trust stage-1 to be in a correct state at that
3030
* point. Since we do not want to force a full load of the
3131
* vcpu state, we prevent the EL1 page-table walker to
3232
* allocate new TLBs. This is done by setting the EPD bits

0 commit comments

Comments
 (0)