From a205a56ea891c354c642713701075fec28906c40 Mon Sep 17 00:00:00 2001 From: Dimitris Papastamos Date: Mon, 12 Mar 2018 14:47:09 +0000 Subject: 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 --- bl31/bl31.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bl31') 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 -- cgit v1.2.3