diff options
| author | John Tsichritzis <john.tsichritzis@arm.com> | 2019-03-19 17:20:52 +0000 |
|---|---|---|
| committer | John Tsichritzis <john.tsichritzis@arm.com> | 2019-05-03 14:23:55 +0100 |
| commit | 076b5f02e2747ef1b5a55f1c5d368df16f046b1c (patch) | |
| tree | 05101ba7422f28e7d8a9826300ad0a20b04086cc /plat/arm | |
| parent | 9a25f98261c134e3af4c1610c4afc74b01201fa2 (diff) | |
Add compile-time errors for HW_ASSISTED_COHERENCY flag
This patch fixes this issue:
https://github.com/ARM-software/tf-issues/issues/660
The introduced changes are the following:
1) Some cores implement cache coherency maintenance operation on the
hardware level. For those cores, such as - but not only - the DynamIQ
cores, it is mandatory that TF-A is compiled with the
HW_ASSISTED_COHERENCY flag. If not, the core behaviour at runtime is
unpredictable. To prevent this, compile time checks have been added and
compilation errors are generated, if needed.
2) To enable this change for FVP, a logical separation has been done for
the core libraries. A system cannot contain cores of both groups, i.e.
cores that manage coherency on hardware and cores that don't do it. As
such, depending on the HW_ASSISTED_COHERENCY flag, FVP includes the
libraries only of the relevant cores.
3) The neoverse_e1.S file has been added to the FVP sources.
Change-Id: I787d15819b2add4ec0d238249e04bf0497dc12f3
Signed-off-by: John Tsichritzis <john.tsichritzis@arm.com>
Diffstat (limited to 'plat/arm')
| -rw-r--r-- | plat/arm/board/fvp/platform.mk | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index c11d848e..9b128a56 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -95,18 +95,25 @@ PLAT_BL_COMMON_SOURCES := plat/arm/board/fvp/fvp_common.c FVP_CPU_LIBS := lib/cpus/${ARCH}/aem_generic.S ifeq (${ARCH}, aarch64) -FVP_CPU_LIBS += lib/cpus/aarch64/cortex_a35.S \ + +# select a different set of CPU files, depending on whether we compile with +# hardware assisted coherency configurations or not +ifeq (${HW_ASSISTED_COHERENCY}, 0) + FVP_CPU_LIBS += lib/cpus/aarch64/cortex_a35.S \ lib/cpus/aarch64/cortex_a53.S \ - lib/cpus/aarch64/cortex_a55.S \ lib/cpus/aarch64/cortex_a57.S \ lib/cpus/aarch64/cortex_a72.S \ - lib/cpus/aarch64/cortex_a73.S \ + lib/cpus/aarch64/cortex_a73.S +else + FVP_CPU_LIBS += lib/cpus/aarch64/cortex_a55.S \ lib/cpus/aarch64/cortex_a75.S \ lib/cpus/aarch64/cortex_a76.S \ lib/cpus/aarch64/cortex_a76ae.S \ lib/cpus/aarch64/neoverse_n1.S \ + lib/cpus/aarch64/neoverse_e1.S \ lib/cpus/aarch64/cortex_deimos.S \ lib/cpus/aarch64/neoverse_zeus.S +endif else FVP_CPU_LIBS += lib/cpus/aarch32/cortex_a32.S @@ -217,10 +224,13 @@ ENABLE_PIE := 1 endif ifeq (${ENABLE_AMU},1) -BL31_SOURCES += lib/cpus/aarch64/cortex_a75_pubsub.c \ - lib/cpus/aarch64/neoverse_n1_pubsub.c \ - lib/cpus/aarch64/cpuamu.c \ +BL31_SOURCES += lib/cpus/aarch64/cpuamu.c \ lib/cpus/aarch64/cpuamu_helpers.S + +ifeq (${HW_ASSISTED_COHERENCY}, 1) +BL31_SOURCES += lib/cpus/aarch64/cortex_a75_pubsub.c \ + lib/cpus/aarch64/neoverse_n1_pubsub.c +endif endif ifeq (${RAS_EXTENSION},1) |