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

Merge pull request #1825 from antonio-nino-diaz-arm/an/csv2 

Update macro to check need for CVE-2017-5715 mitigation
This commit is contained in:
Antonio Niño Díaz 2019-02-19 10:04:00 +00:00 committed by GitHub
parent fa233ac9d4 ff6f62e105
commit 41bd188266
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/lib/cpus/aarch64/cpu_macros.S
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2014-2019, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -7,6 +7,7 @@
#define CPU_MACROS_S #define CPU_MACROS_S
#include <arch.h> #include <arch.h>
#include <assert_macros.S>
#include <lib/cpus/errata_report.h> #include <lib/cpus/errata_report.h>
#define CPU_IMPL_PN_MASK (MIDR_IMPL_MASK << MIDR_IMPL_SHIFT) | \ #define CPU_IMPL_PN_MASK (MIDR_IMPL_MASK << MIDR_IMPL_SHIFT) | \
@ -263,11 +264,22 @@
mrs \_reg, id_aa64pfr0_el1 mrs \_reg, id_aa64pfr0_el1
ubfx \_reg, \_reg, #ID_AA64PFR0_CSV2_SHIFT, #ID_AA64PFR0_CSV2_LENGTH ubfx \_reg, \_reg, #ID_AA64PFR0_CSV2_SHIFT, #ID_AA64PFR0_CSV2_LENGTH
/* /*
* If the field equals to 1 then branch targets trained in one * If the field equals 1, branch targets trained in one context cannot
* context cannot affect speculative execution in a different context. * affect speculative execution in a different context.
*
* If the field equals 2, it means that the system is also aware of
* SCXTNUM_ELx register contexts. We aren't using them in the TF, so we
* expect users of the registers to do the right thing.
*
* Only apply mitigations if the value of this field is 0.
*/ */
cmp \_reg, #1 #if ENABLE_ASSERTIONS
beq \_label cmp \_reg, #3 /* Only values 0 to 2 are expected */
ASM_ASSERT(lo)
#endif
cmp \_reg, #0
bne \_label
.endm .endm
/* /*