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

Merge pull request #1889 from jts-arm/var4 

Apply variant 4 mitigation for Neoverse N1
This commit is contained in:
Dimitris Papastamos 2019-03-15 15:28:08 +00:00 committed by GitHub
parent d409c3eb3e 8074448f09
commit 136b9fa7c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/arch/aarch64/arch.h
View File

@ -843,4 +843,9 @@
#define DIT S3_3_C4_C2_5
#define DIT_BIT BIT(24)
/*******************************************************************************
* Armv8.5 - new MSR encoding to directly access PSTATE.SSBS field
******************************************************************************/
#define SSBS S3_3_C4_C2_6
#endif /* ARCH_H */

4
lib/cpus/aarch64/neoverse_n1.S
View File

@ -46,6 +46,10 @@ endfunc check_errata_1043202
func neoverse_n1_reset_func
mov x19, x30
/* Disables speculative loads */
msr SSBS, xzr
bl cpu_get_rev_var
mov x18, x0