mirrors/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-08-21 06:21:09 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "Invalidate dcache build option for bl2 entry at EL3" into integration

Browse Source
This commit is contained in:
Soby Mathew 2019-09-12 16:09:56 +00:00 committed by TrustedFirmware Code Review
commit f52f73b3ee
5 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -689,6 +689,7 @@ $(eval $(call assert_boolean,USE_TBBR_DEFS))
$(eval $(call assert_boolean,WARMBOOT_ENABLE_DCACHE_EARLY)) $(eval $(call assert_boolean,WARMBOOT_ENABLE_DCACHE_EARLY))
$(eval $(call assert_boolean,BL2_AT_EL3)) $(eval $(call assert_boolean,BL2_AT_EL3))
$(eval $(call assert_boolean,BL2_IN_XIP_MEM)) $(eval $(call assert_boolean,BL2_IN_XIP_MEM))
$(eval $(call assert_boolean,BL2_INV_DCACHE))
$(eval $(call assert_numeric,ARM_ARCH_MAJOR)) $(eval $(call assert_numeric,ARM_ARCH_MAJOR))
$(eval $(call assert_numeric,ARM_ARCH_MINOR)) $(eval $(call assert_numeric,ARM_ARCH_MINOR))
@ -749,6 +750,7 @@ $(eval $(call add_define,USE_TBBR_DEFS))
$(eval $(call add_define,WARMBOOT_ENABLE_DCACHE_EARLY)) $(eval $(call add_define,WARMBOOT_ENABLE_DCACHE_EARLY))
$(eval $(call add_define,BL2_AT_EL3)) $(eval $(call add_define,BL2_AT_EL3))
$(eval $(call add_define,BL2_IN_XIP_MEM)) $(eval $(call add_define,BL2_IN_XIP_MEM))
$(eval $(call add_define,BL2_INV_DCACHE))
ifeq (${SANITIZE_UB},trap) ifeq (${SANITIZE_UB},trap)
$(eval $(call add_define,MONITOR_TRAPS)) $(eval $(call add_define,MONITOR_TRAPS))

6
docs/getting_started/user-guide.rst
View File

@ -287,6 +287,12 @@ Common build options
enable this use-case. For now, this option is only supported when BL2_AT_EL3 enable this use-case. For now, this option is only supported when BL2_AT_EL3
is set to '1'. is set to '1'.
- ``BL2_INV_DCACHE``: This is an optional build option which control dcache
invalidation upon BL2 entry. Some platform cannot handle cache operations
during entry as the coherency unit is not yet initialized. This may cause
crashing. Leaving this option to '1' (default) will allow the operation.
This option is only relevant when BL2_AT_EL3 is set to '1'.
- ``BL31``: This is an optional build option which specifies the path to - ``BL31``: This is an optional build option which specifies the path to
BL31 image for the ``fip`` target. In this case, the BL31 in TF-A will not BL31 image for the ``fip`` target. In this case, the BL31 in TF-A will not
be built. be built.

2
include/arch/aarch64/el3_common_macros.S
View File

@ -333,7 +333,7 @@
* --------------------------------------------------------------------- * ---------------------------------------------------------------------
*/ */
.if \_init_c_runtime .if \_init_c_runtime
#if defined(IMAGE_BL31) || (defined(IMAGE_BL2) && BL2_AT_EL3) #if defined(IMAGE_BL31) || (defined(IMAGE_BL2) && BL2_AT_EL3 && BL2_INV_DCACHE)
/* ------------------------------------------------------------- /* -------------------------------------------------------------
* Invalidate the RW memory used by the BL31 image. This * Invalidate the RW memory used by the BL31 image. This
* includes the data and NOBITS sections. This is done to * includes the data and NOBITS sections. This is done to

3
make_helpers/defaults.mk
View File

@ -33,6 +33,9 @@ BL2_AT_EL3 := 0
# when BL2_AT_EL3 is 1. # when BL2_AT_EL3 is 1.
BL2_IN_XIP_MEM := 0 BL2_IN_XIP_MEM := 0
# Do dcache invalidate upon BL2 entry at EL3
BL2_INV_DCACHE := 1
# Select the branch protection features to use. # Select the branch protection features to use.
BRANCH_PROTECTION := 0 BRANCH_PROTECTION := 0

1
plat/intel/soc/agilex/platform.mk
View File

@ -70,5 +70,6 @@ BL31_SOURCES += \
PROGRAMMABLE_RESET_ADDRESS := 0 PROGRAMMABLE_RESET_ADDRESS := 0
BL2_AT_EL3 := 1 BL2_AT_EL3 := 1
BL2_INV_DCACHE := 0
MULTI_CONSOLE_API := 1 MULTI_CONSOLE_API := 1
USE_COHERENT_MEM := 1 USE_COHERENT_MEM := 1