2 files changed, 17 insertions, 17 deletions

diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index c50a7a75f2e0..1a7811b7e3c4 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -336,6 +336,21 @@ alternative_if ARM64_WORKAROUND_845719
 alternative_else_nop_endif
 #endif
 3:
+#ifdef CONFIG_ARM64_ERRATUM_1188873
+alternative_if_not ARM64_WORKAROUND_1188873
+        b       4f
+alternative_else_nop_endif
+        /*
+         * if (x22.mode32 == cntkctl_el1.el0vcten)
+         *     cntkctl_el1.el0vcten = ~cntkctl_el1.el0vcten
+         */
+        mrs     x1, cntkctl_el1
+        eon     x0, x1, x22, lsr #3
+        tbz     x0, #1, 4f
+        eor     x1, x1, #2      // ARCH_TIMER_USR_VCT_ACCESS_EN
+        msr     cntkctl_el1, x1
+4:
+#endif
         apply_ssbd 0, x0, x1
         .endif
 
@@ -362,11 +377,11 @@ alternative_else_nop_endif
         .if     \el == 0
 alternative_insn eret, nop, ARM64_UNMAP_KERNEL_AT_EL0
 #ifdef CONFIG_UNMAP_KERNEL_AT_EL0
-        bne     4f
+        bne     5f
         msr     far_el1, x30
         tramp_alias     x30, tramp_exit_native
         br      x30
-4:
+5:
         tramp_alias     x30, tramp_exit_compat
         br      x30
 #endif
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index aa4ec53281ce..da11a9508b77 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -319,13 +319,6 @@ static u64 notrace arm64_858921_read_cntvct_el0(void)
 }
 #endif
 
-#ifdef CONFIG_ARM64_ERRATUM_1188873
-static u64 notrace arm64_1188873_read_cntvct_el0(void)
-{
-        return read_sysreg(cntvct_el0);
-}
-#endif
-
 #ifdef CONFIG_SUN50I_ERRATUM_UNKNOWN1
 /*
  * The low bits of the counter registers are indeterminate while bit 10 or
@@ -457,14 +450,6 @@ static const struct arch_timer_erratum_workaround ool_workarounds[] = {
                 .read_cntvct_el0 = arm64_858921_read_cntvct_el0,
         },
 #endif
-#ifdef CONFIG_ARM64_ERRATUM_1188873
-        {
-                .match_type = ate_match_local_cap_id,
-                .id = (void *)ARM64_WORKAROUND_1188873,
-                .desc = "ARM erratum 1188873",
-                .read_cntvct_el0 = arm64_1188873_read_cntvct_el0,
-        },
-#endif
 #ifdef CONFIG_SUN50I_ERRATUM_UNKNOWN1
         {
                 .match_type = ate_match_dt,