Merge "Zeus: apply the MSR SSBS instruction" into integration

diff --git a/lib/cpus/aarch64/neoverse_zeus.S b/lib/cpus/aarch64/neoverse_zeus.S
index 3d850137c108b3ac4e6d4eb36c31c5963291508d..44882b45935a2d1f2dcb4535c816f3383d154824 100644 (file)
--- a/lib/cpus/aarch64/neoverse_zeus.S
+++ b/lib/cpus/aarch64/neoverse_zeus.S
@@ -46,6 +46,16 @@ func neoverse_zeus_errata_report
 endfunc neoverse_zeus_errata_report
 #endif
 
+func neoverse_zeus_reset_func
+       mov     x19, x30
+
+       /* Disable speculative loads */
+       msr     SSBS, xzr
+
+       isb
+       ret     x19
+endfunc neoverse_zeus_reset_func
+
        /* ---------------------------------------------
         * This function provides Neoverse-Zeus specific
         * register information for crash reporting.
@@ -66,5 +76,5 @@ func neoverse_zeus_cpu_reg_dump
 endfunc neoverse_zeus_cpu_reg_dump
 
 declare_cpu_ops neoverse_zeus, NEOVERSE_ZEUS_MIDR, \
-       CPU_NO_RESET_FUNC, \
+       neoverse_zeus_reset_func, \
        neoverse_zeus_core_pwr_dwn