Skip to content

Commit 4b661d6

Browse files
Marc Zyngierwilldeacon
authored andcommitted
arm64: arch_timer: Disable the compat vdso for cores affected by ARM64_WORKAROUND_1418040
ARM64_WORKAROUND_1418040 requires that AArch32 EL0 accesses to the virtual counter register are trapped and emulated by the kernel. This makes the vdso pretty pointless, and in some cases livelock prone. Provide a workaround entry that limits the vdso to 64bit tasks. Signed-off-by: Marc Zyngier <[email protected]> Acked-by: Mark Rutland <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent c1fbec4 commit 4b661d6

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

drivers/clocksource/arm_arch_timer.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,14 @@ static const struct arch_timer_erratum_workaround ool_workarounds[] = {
480480
.set_next_event_virt = erratum_set_next_event_tval_virt,
481481
},
482482
#endif
483+
#ifdef CONFIG_ARM64_ERRATUM_1418040
484+
{
485+
.match_type = ate_match_local_cap_id,
486+
.id = (void *)ARM64_WORKAROUND_1418040,
487+
.desc = "ARM erratum 1418040",
488+
.disable_compat_vdso = true,
489+
},
490+
#endif
483491
};
484492

485493
typedef bool (*ate_match_fn_t)(const struct arch_timer_erratum_workaround *,

0 commit comments

Comments
 (0)