andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Soby Mathew 2019-09-12 11:38:42 +00:00 committed by TrustedFirmware Code Review
parent 684b3a0205 07f979bcc7
commit 18eb0025b3
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/cpus/aarch64/neoverse_zeus.S
View File

@ -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