fix(cpus): workaround for Neoverse V1 erratum 2743093

Neoverse V1 erratum 2743093 is a Cat B erratum that applies to
all revisions <=r1p2 and is still open. The workaround is to
insert a dsb before the isb in the power down sequence.

SDEN documentation:
https://developer.arm.com/documentation/SDEN1401781/latest

Signed-off-by: Bipin Ravi <bipin.ravi@arm.com>
Change-Id: I8ee7c16c14c4fd6ee35d20c855273ecfce0d1b32

diff --git a/docs/design/cpu-specific-build-macros.rst b/docs/design/cpu-specific-build-macros.rst
index c07a0aa163005e613313ce0d141dc3e21d95c267..ac2db093c8564c436f7dd6ed520fdacb6fbd3f75 100644 (file)
--- a/docs/design/cpu-specific-build-macros.rst
+++ b/docs/design/cpu-specific-build-macros.rst
@@ -460,6 +460,10 @@ For Neoverse V1, the following errata build flags are defined :
    CPU. This needs to be enabled for revisions r0p0, r1p0 and r1p1 of the CPU.
    It is still open.
 
+-  ``ERRATA_V1_2743093``: This applies errata 2743093 workaround to Neoverse-V1
+   CPU. This needs to be enabled for revisions r0p0, r1p0, r1p1 and r1p2 of the
+   CPU. It is still open.
+
 For Cortex-A710, the following errata build flags are defined :
 
 -  ``ERRATA_A710_1987031``: This applies errata 1987031 workaround to

diff --git a/lib/cpus/aarch64/neoverse_v1.S b/lib/cpus/aarch64/neoverse_v1.S
index 3282fbc6adb8a997e420cecec050da38d9bee95d..c3a70ca4ceb4a18d33a74feaa3260d15b17d1d27 100644 (file)
--- a/lib/cpus/aarch64/neoverse_v1.S
+++ b/lib/cpus/aarch64/neoverse_v1.S
@@ -462,6 +462,30 @@ func check_errata_2372203
        b       cpu_rev_var_ls
 endfunc check_errata_2372203
 
+       /* ----------------------------------------------------
+        * Errata Workaround for Neoverse V1 Errata #2743093.
+        * This applies to revisions <= r1p2 and is still open.
+        * x0: variant[4:7] and revision[0:3] of current cpu.
+        * Shall clobber: x0-x17
+        * ----------------------------------------------------
+        */
+func errata_neoverse_v1_2743093_wa
+       mov     x17, x30
+       bl      check_errata_2743093
+       cbz     x0, 1f
+
+       /* dsb before isb of power down sequence */
+       dsb     sy
+1:
+       ret     x17
+endfunc errata_neoverse_v1_2743093_wa
+
+func check_errata_2743093
+       /* Applies to all revisions <= r1p2 */
+       mov     x1, #0x12
+       b       cpu_rev_var_ls
+endfunc check_errata_2743093
+
 func check_errata_cve_2022_23960
 #if WORKAROUND_CVE_2022_23960
        mov     x0, #ERRATA_APPLIES
@@ -483,6 +507,12 @@ func neoverse_v1_core_pwr_dwn
        mrs     x0, NEOVERSE_V1_CPUPWRCTLR_EL1
        orr     x0, x0, #NEOVERSE_V1_CPUPWRCTLR_EL1_CORE_PWRDN_BIT
        msr     NEOVERSE_V1_CPUPWRCTLR_EL1, x0
+#if ERRATA_V1_2743093
+       mov     x15, x30
+       bl      cpu_get_rev_var
+       bl      errata_neoverse_v1_2743093_wa
+       mov     x30, x15
+#endif /* ERRATA_V1_2743093 */
        isb
        ret
 endfunc neoverse_v1_core_pwr_dwn
@@ -513,6 +543,7 @@ func neoverse_v1_errata_report
        report_errata ERRATA_V1_2216392, neoverse_v1, 2216392
        report_errata ERRATA_V1_2294912, neoverse_v1, 2294912
        report_errata ERRATA_V1_2372203, neoverse_v1, 2372203
+       report_errata ERRATA_V1_2743093, neoverse_v1, 2743093
        report_errata WORKAROUND_CVE_2022_23960, neoverse_v1, cve_2022_23960
 
        ldp     x8, x30, [sp], #16

diff --git a/lib/cpus/cpu-ops.mk b/lib/cpus/cpu-ops.mk
index 527a82f28b05471547c5c5efa7b8acc1f0118997..69c474e8808e42e6dbb4a9629b540f518253a31b 100644 (file)
--- a/lib/cpus/cpu-ops.mk
+++ b/lib/cpus/cpu-ops.mk
@@ -516,6 +516,11 @@ ERRATA_V1_2294912  ?=0
 # to revisions r0p0, r1p0 and r1p1 of the Neoverse V1 cpu and is still open.
 ERRATA_V1_2372203      ?=0
 
+# Flag to apply erratum 2743093 workaround during powerdown. This erratum
+# applies to revisions r0p0, r1p0, r1p1 and r1p2  of the Neoverse V1 cpu and is
+# still open.
+ERRATA_V1_2743093      ?=0
+
 # Flag to apply erratum 1987031 workaround during reset. This erratum applies
 # to revisions r0p0, r1p0 and r2p0 of the Cortex-A710 cpu and is still open.
 ERRATA_A710_1987031    ?=0
@@ -1162,6 +1167,10 @@ $(eval $(call add_define,ERRATA_V1_2294912))
 $(eval $(call assert_boolean,ERRATA_V1_2372203))
 $(eval $(call add_define,ERRATA_V1_2372203))
 
+# Process ERRATA_V1_2743093 flag
+$(eval $(call assert_boolean,ERRATA_V1_2743093))
+$(eval $(call add_define,ERRATA_V1_2743093))
+
 # Process ERRATA_A710_1987031 flag
 $(eval $(call assert_boolean,ERRATA_A710_1987031))
 $(eval $(call add_define,ERRATA_A710_1987031))