diff options
author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-03-12 14:47:09 +0000 |
---|---|---|
committer | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-03-14 11:19:53 +0000 |
commit | a205a56ea891c354c642713701075fec28906c40 (patch) | |
tree | 1628809d59852289308473302ff04414388b8737 /bl31/bl31.mk | |
parent | 3991a6a49f3cf8d0b30a2800428e60454e2f92dd (diff) |
Fixup `SMCCC_ARCH_FEATURES` semantics
When querying `SMCCC_ARCH_WORKAROUND_1` through `SMCCC_ARCH_FEATURES`,
return either:
* -1 to indicate the PE on which `SMCCC_ARCH_FEATURES` is called
requires firmware mitigation for CVE-2017-5715 but the mitigation
is not compiled in.
* 0 to indicate that firmware mitigation is required, or
* 1 to indicate that no firmware mitigation is required.
This patch complies with v1.2 of the firmware interfaces
specification (ARM DEN 0070A).
Change-Id: Ibc32d6620efdac6c340758ec502d95554a55f02a
Signed-off-by: Dimitris Papastamos <dimitris.papastamos@arm.com>
Diffstat (limited to 'bl31/bl31.mk')
-rw-r--r-- | bl31/bl31.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bl31/bl31.mk b/bl31/bl31.mk index 886d3016..0e47ddf6 100644 --- a/bl31/bl31.mk +++ b/bl31/bl31.mk @@ -61,8 +61,8 @@ BL31_SOURCES += lib/extensions/sve/sve.c endif ifeq (${WORKAROUND_CVE_2017_5715},1) -BL31_SOURCES += lib/cpus/aarch64/workaround_cve_2017_5715_mmu.S \ - lib/cpus/aarch64/workaround_cve_2017_5715_bpiall.S +BL31_SOURCES += lib/cpus/aarch64/workaround_cve_2017_5715_bpiall.S \ + lib/cpus/aarch64/workaround_cve_2017_5715_mmu.S endif BL31_LINKERFILE := bl31/bl31.ld.S |