mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-17 10:04:26 +00:00
e3f2b1a932
Trace analysis of FVP_Base_AEMv8A 0.0/6063 model running in Aarch32 mode with the build options listed below: TRUSTED_BOARD_BOOT=1 GENERATE_COT=1 ARM_ROTPK_LOCATION=devel_ecdsa KEY_ALG=ecdsa ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_ecdsa.pem shows that when auth_signature() gets called 71.99% of CPU execution time is spent in memset() function written in C using single byte write operations, see lib\libc\memset.c. This patch introduces new libc_asm.mk makefile which replaces C memset() implementation with assembler version giving the following results: - for Aarch32 in auth_signature() call memset() CPU time reduced to 20.56%. The number of CPU instructions (Inst) executed during TF-A boot stage before start of BL33 in RELEASE builds for different versions is presented in the tables below, where: - C TF-A: existing TF-A C code; - C musl: "lightweight code" C "implementation of the standard library for Linux-based systems" https://git.musl-libc.org/cgit/musl/tree/src/string/memset.c - Asm Opt: assemler version from "Arm Optimized Routines" project https://github.com/ARM-software/optimized-routines/blob/ master/string/arm/memset.S - Asm Linux: assembler version from Linux kernel https://github.com/torvalds/linux/blob/master/arch/arm/lib/memset.S - Asm TF-A: assembler version from this patch Aarch32: +-----------+------+------+--------------+----------+ | Variant | Set | Size | Inst | Ratio | +-----------+------+------+--------------+----------+ | C TF-A | T32 | 16 | 2122110003 | 1.000000 | | C musl | T32 | 156 | 1643917668 | 0.774662 | | Asm Opt | T32 | 84 | 1604810003 | 0.756233 | | Asm Linux | A32 | 168 | 1566255018 | 0.738065 | | Asm TF-A | A32 | 160 | 1525865101 | 0.719032 | +-----------+------+------+--------------+----------+ AArch64: +-----------+------+------------+----------+ | Variant | Size | Inst | Ratio | +-----------+------+------------+----------+ | C TF-A | 28 | 2732497518 | 1.000000 | | C musl | 212 | 1802999999 | 0.659836 | | Asm TF-A | 140 | 1680260003 | 0.614917 | +-----------+------+------------+----------+ This patch modifies 'plat\arm\common\arm_common.mk' by overriding libc.mk makefile with libc_asm.mk and does not effect other platforms. Change-Id: Ie89dd0b74ba1079420733a0d76b7366ad0157c2e Signed-off-by: Alexei Fedorov <Alexei.Fedorov@arm.com>
351 lines
10 KiB
Makefile
351 lines
10 KiB
Makefile
#
|
|
# Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
|
|
#
|
|
# SPDX-License-Identifier: BSD-3-Clause
|
|
#
|
|
|
|
ifeq (${ARCH}, aarch64)
|
|
# On ARM standard platorms, the TSP can execute from Trusted SRAM, Trusted
|
|
# DRAM (if available) or the TZC secured area of DRAM.
|
|
# TZC secured DRAM is the default.
|
|
|
|
ARM_TSP_RAM_LOCATION ?= dram
|
|
|
|
ifeq (${ARM_TSP_RAM_LOCATION}, tsram)
|
|
ARM_TSP_RAM_LOCATION_ID = ARM_TRUSTED_SRAM_ID
|
|
else ifeq (${ARM_TSP_RAM_LOCATION}, tdram)
|
|
ARM_TSP_RAM_LOCATION_ID = ARM_TRUSTED_DRAM_ID
|
|
else ifeq (${ARM_TSP_RAM_LOCATION}, dram)
|
|
ARM_TSP_RAM_LOCATION_ID = ARM_DRAM_ID
|
|
else
|
|
$(error "Unsupported ARM_TSP_RAM_LOCATION value")
|
|
endif
|
|
|
|
# Process flags
|
|
# Process ARM_BL31_IN_DRAM flag
|
|
ARM_BL31_IN_DRAM := 0
|
|
$(eval $(call assert_boolean,ARM_BL31_IN_DRAM))
|
|
$(eval $(call add_define,ARM_BL31_IN_DRAM))
|
|
else
|
|
ARM_TSP_RAM_LOCATION_ID = ARM_TRUSTED_SRAM_ID
|
|
endif
|
|
|
|
$(eval $(call add_define,ARM_TSP_RAM_LOCATION_ID))
|
|
|
|
|
|
# For the original power-state parameter format, the State-ID can be encoded
|
|
# according to the recommended encoding or zero. This flag determines which
|
|
# State-ID encoding to be parsed.
|
|
ARM_RECOM_STATE_ID_ENC := 0
|
|
|
|
# If the PSCI_EXTENDED_STATE_ID is set, then ARM_RECOM_STATE_ID_ENC need to
|
|
# be set. Else throw a build error.
|
|
ifeq (${PSCI_EXTENDED_STATE_ID}, 1)
|
|
ifeq (${ARM_RECOM_STATE_ID_ENC}, 0)
|
|
$(error Build option ARM_RECOM_STATE_ID_ENC needs to be set if \
|
|
PSCI_EXTENDED_STATE_ID is set for ARM platforms)
|
|
endif
|
|
endif
|
|
|
|
# Process ARM_RECOM_STATE_ID_ENC flag
|
|
$(eval $(call assert_boolean,ARM_RECOM_STATE_ID_ENC))
|
|
$(eval $(call add_define,ARM_RECOM_STATE_ID_ENC))
|
|
|
|
# Process ARM_DISABLE_TRUSTED_WDOG flag
|
|
# By default, Trusted Watchdog is always enabled unless SPIN_ON_BL1_EXIT is set
|
|
ARM_DISABLE_TRUSTED_WDOG := 0
|
|
ifeq (${SPIN_ON_BL1_EXIT}, 1)
|
|
ARM_DISABLE_TRUSTED_WDOG := 1
|
|
endif
|
|
$(eval $(call assert_boolean,ARM_DISABLE_TRUSTED_WDOG))
|
|
$(eval $(call add_define,ARM_DISABLE_TRUSTED_WDOG))
|
|
|
|
# Process ARM_CONFIG_CNTACR
|
|
ARM_CONFIG_CNTACR := 1
|
|
$(eval $(call assert_boolean,ARM_CONFIG_CNTACR))
|
|
$(eval $(call add_define,ARM_CONFIG_CNTACR))
|
|
|
|
# Process ARM_BL31_IN_DRAM flag
|
|
ARM_BL31_IN_DRAM := 0
|
|
$(eval $(call assert_boolean,ARM_BL31_IN_DRAM))
|
|
$(eval $(call add_define,ARM_BL31_IN_DRAM))
|
|
|
|
# Process ARM_PLAT_MT flag
|
|
ARM_PLAT_MT := 0
|
|
$(eval $(call assert_boolean,ARM_PLAT_MT))
|
|
$(eval $(call add_define,ARM_PLAT_MT))
|
|
|
|
# Use translation tables library v2 by default
|
|
ARM_XLAT_TABLES_LIB_V1 := 0
|
|
$(eval $(call assert_boolean,ARM_XLAT_TABLES_LIB_V1))
|
|
$(eval $(call add_define,ARM_XLAT_TABLES_LIB_V1))
|
|
|
|
# Don't have the Linux kernel as a BL33 image by default
|
|
ARM_LINUX_KERNEL_AS_BL33 := 0
|
|
$(eval $(call assert_boolean,ARM_LINUX_KERNEL_AS_BL33))
|
|
$(eval $(call add_define,ARM_LINUX_KERNEL_AS_BL33))
|
|
|
|
ifeq (${ARM_LINUX_KERNEL_AS_BL33},1)
|
|
ifeq (${ARCH},aarch64)
|
|
ifneq (${RESET_TO_BL31},1)
|
|
$(error "ARM_LINUX_KERNEL_AS_BL33 is only available if RESET_TO_BL31=1.")
|
|
endif
|
|
else
|
|
ifneq (${RESET_TO_SP_MIN},1)
|
|
$(error "ARM_LINUX_KERNEL_AS_BL33 is only available if RESET_TO_SP_MIN=1.")
|
|
endif
|
|
endif
|
|
ifndef PRELOADED_BL33_BASE
|
|
$(error "PRELOADED_BL33_BASE must be set if ARM_LINUX_KERNEL_AS_BL33 is used.")
|
|
endif
|
|
ifndef ARM_PRELOADED_DTB_BASE
|
|
$(error "ARM_PRELOADED_DTB_BASE must be set if ARM_LINUX_KERNEL_AS_BL33 is used.")
|
|
endif
|
|
$(eval $(call add_define,ARM_PRELOADED_DTB_BASE))
|
|
endif
|
|
|
|
# Use an implementation of SHA-256 with a smaller memory footprint but reduced
|
|
# speed.
|
|
$(eval $(call add_define,MBEDTLS_SHA256_SMALLER))
|
|
|
|
# Add the build options to pack Trusted OS Extra1 and Trusted OS Extra2 images
|
|
# in the FIP if the platform requires.
|
|
ifneq ($(BL32_EXTRA1),)
|
|
$(eval $(call TOOL_ADD_IMG,bl32_extra1,--tos-fw-extra1))
|
|
endif
|
|
ifneq ($(BL32_EXTRA2),)
|
|
$(eval $(call TOOL_ADD_IMG,bl32_extra2,--tos-fw-extra2))
|
|
endif
|
|
|
|
# Enable PSCI_STAT_COUNT/RESIDENCY APIs on ARM platforms
|
|
ENABLE_PSCI_STAT := 1
|
|
ENABLE_PMF := 1
|
|
|
|
# Override the standard libc with optimised libc_asm
|
|
OVERRIDE_LIBC := 1
|
|
ifeq (${OVERRIDE_LIBC},1)
|
|
include lib/libc/libc_asm.mk
|
|
endif
|
|
|
|
# On ARM platforms, separate the code and read-only data sections to allow
|
|
# mapping the former as executable and the latter as execute-never.
|
|
SEPARATE_CODE_AND_RODATA := 1
|
|
|
|
# On ARM platforms, disable SEPARATE_NOBITS_REGION by default. Both PROGBITS
|
|
# and NOBITS sections of BL31 image are adjacent to each other and loaded
|
|
# into Trusted SRAM.
|
|
SEPARATE_NOBITS_REGION := 0
|
|
|
|
# In order to support SEPARATE_NOBITS_REGION for Arm platforms, we need to load
|
|
# BL31 PROGBITS into secure DRAM space and BL31 NOBITS into SRAM. Hence mandate
|
|
# the build to require that ARM_BL31_IN_DRAM is enabled as well.
|
|
ifeq ($(SEPARATE_NOBITS_REGION),1)
|
|
ifneq ($(ARM_BL31_IN_DRAM),1)
|
|
$(error For SEPARATE_NOBITS_REGION, ARM_BL31_IN_DRAM must be enabled)
|
|
endif
|
|
ifneq ($(RECLAIM_INIT_CODE),0)
|
|
$(error For SEPARATE_NOBITS_REGION, RECLAIM_INIT_CODE cannot be supported)
|
|
endif
|
|
endif
|
|
|
|
# Disable ARM Cryptocell by default
|
|
ARM_CRYPTOCELL_INTEG := 0
|
|
$(eval $(call assert_boolean,ARM_CRYPTOCELL_INTEG))
|
|
$(eval $(call add_define,ARM_CRYPTOCELL_INTEG))
|
|
|
|
# Enable PIE support for RESET_TO_BL31 case
|
|
ifeq (${RESET_TO_BL31},1)
|
|
ENABLE_PIE := 1
|
|
endif
|
|
|
|
# CryptoCell integration relies on coherent buffers for passing data from
|
|
# the AP CPU to the CryptoCell
|
|
ifeq (${ARM_CRYPTOCELL_INTEG},1)
|
|
ifeq (${USE_COHERENT_MEM},0)
|
|
$(error "ARM_CRYPTOCELL_INTEG needs USE_COHERENT_MEM to be set.")
|
|
endif
|
|
endif
|
|
|
|
ifeq (${ARCH}, aarch64)
|
|
PLAT_INCLUDES += -Iinclude/plat/arm/common/aarch64
|
|
endif
|
|
|
|
PLAT_BL_COMMON_SOURCES += plat/arm/common/${ARCH}/arm_helpers.S \
|
|
plat/arm/common/arm_common.c \
|
|
plat/arm/common/arm_console.c
|
|
|
|
ifeq (${ARM_XLAT_TABLES_LIB_V1}, 1)
|
|
PLAT_BL_COMMON_SOURCES += lib/xlat_tables/xlat_tables_common.c \
|
|
lib/xlat_tables/${ARCH}/xlat_tables.c
|
|
else
|
|
include lib/xlat_tables_v2/xlat_tables.mk
|
|
|
|
PLAT_BL_COMMON_SOURCES += ${XLAT_TABLES_LIB_SRCS}
|
|
endif
|
|
|
|
ARM_IO_SOURCES += plat/arm/common/arm_io_storage.c \
|
|
plat/arm/common/fconf/arm_fconf_io.c
|
|
ifeq (${SPD},spmd)
|
|
ifeq (${SPMD_SPM_AT_SEL2},1)
|
|
ARM_IO_SOURCES += plat/arm/common/fconf/arm_fconf_sp.c
|
|
endif
|
|
endif
|
|
|
|
BL1_SOURCES += drivers/io/io_fip.c \
|
|
drivers/io/io_memmap.c \
|
|
drivers/io/io_storage.c \
|
|
plat/arm/common/arm_bl1_setup.c \
|
|
plat/arm/common/arm_err.c \
|
|
${ARM_IO_SOURCES}
|
|
|
|
ifdef EL3_PAYLOAD_BASE
|
|
# Need the plat_arm_program_trusted_mailbox() function to release secondary CPUs from
|
|
# their holding pen
|
|
BL1_SOURCES += plat/arm/common/arm_pm.c
|
|
endif
|
|
|
|
BL2_SOURCES += drivers/delay_timer/delay_timer.c \
|
|
drivers/delay_timer/generic_delay_timer.c \
|
|
drivers/io/io_fip.c \
|
|
drivers/io/io_memmap.c \
|
|
drivers/io/io_storage.c \
|
|
plat/arm/common/arm_bl2_setup.c \
|
|
plat/arm/common/arm_err.c \
|
|
${ARM_IO_SOURCES}
|
|
|
|
# Firmware Configuration Framework sources
|
|
include lib/fconf/fconf.mk
|
|
|
|
# Add `libfdt` and Arm common helpers required for Dynamic Config
|
|
include lib/libfdt/libfdt.mk
|
|
|
|
DYN_CFG_SOURCES += plat/arm/common/arm_dyn_cfg.c \
|
|
plat/arm/common/arm_dyn_cfg_helpers.c \
|
|
common/fdt_wrappers.c
|
|
|
|
BL1_SOURCES += ${DYN_CFG_SOURCES}
|
|
BL2_SOURCES += ${DYN_CFG_SOURCES}
|
|
|
|
ifeq (${BL2_AT_EL3},1)
|
|
BL2_SOURCES += plat/arm/common/arm_bl2_el3_setup.c
|
|
endif
|
|
|
|
# Because BL1/BL2 execute in AArch64 mode but BL32 in AArch32 we need to use
|
|
# the AArch32 descriptors.
|
|
ifeq (${JUNO_AARCH32_EL3_RUNTIME},1)
|
|
BL2_SOURCES += plat/arm/common/aarch32/arm_bl2_mem_params_desc.c
|
|
else
|
|
BL2_SOURCES += plat/arm/common/${ARCH}/arm_bl2_mem_params_desc.c
|
|
endif
|
|
BL2_SOURCES += plat/arm/common/arm_image_load.c \
|
|
common/desc_image_load.c
|
|
ifeq (${SPD},opteed)
|
|
BL2_SOURCES += lib/optee/optee_utils.c
|
|
endif
|
|
|
|
BL2U_SOURCES += drivers/delay_timer/delay_timer.c \
|
|
drivers/delay_timer/generic_delay_timer.c \
|
|
plat/arm/common/arm_bl2u_setup.c
|
|
|
|
BL31_SOURCES += plat/arm/common/arm_bl31_setup.c \
|
|
plat/arm/common/arm_pm.c \
|
|
plat/arm/common/arm_topology.c \
|
|
plat/common/plat_psci_common.c
|
|
|
|
ifeq (${ENABLE_PMF}, 1)
|
|
ifeq (${ARCH}, aarch64)
|
|
BL31_SOURCES += plat/arm/common/aarch64/execution_state_switch.c\
|
|
plat/arm/common/arm_sip_svc.c \
|
|
lib/pmf/pmf_smc.c
|
|
else
|
|
BL32_SOURCES += plat/arm/common/arm_sip_svc.c \
|
|
lib/pmf/pmf_smc.c
|
|
endif
|
|
endif
|
|
|
|
ifeq (${EL3_EXCEPTION_HANDLING},1)
|
|
BL31_SOURCES += plat/arm/common/aarch64/arm_ehf.c
|
|
endif
|
|
|
|
ifeq (${SDEI_SUPPORT},1)
|
|
BL31_SOURCES += plat/arm/common/aarch64/arm_sdei.c
|
|
ifeq (${SDEI_IN_FCONF},1)
|
|
BL31_SOURCES += plat/arm/common/fconf/fconf_sdei_getter.c
|
|
endif
|
|
endif
|
|
|
|
# RAS sources
|
|
ifeq (${RAS_EXTENSION},1)
|
|
BL31_SOURCES += lib/extensions/ras/std_err_record.c \
|
|
lib/extensions/ras/ras_common.c
|
|
endif
|
|
|
|
# Pointer Authentication sources
|
|
ifeq (${ENABLE_PAUTH}, 1)
|
|
PLAT_BL_COMMON_SOURCES += plat/arm/common/aarch64/arm_pauth.c \
|
|
lib/extensions/pauth/pauth_helpers.S
|
|
endif
|
|
|
|
ifeq (${SPD},spmd)
|
|
BL31_SOURCES += plat/common/plat_spmd_manifest.c \
|
|
common/fdt_wrappers.c \
|
|
${LIBFDT_SRCS}
|
|
|
|
endif
|
|
|
|
ifneq (${TRUSTED_BOARD_BOOT},0)
|
|
|
|
# Include common TBB sources
|
|
AUTH_SOURCES := drivers/auth/auth_mod.c \
|
|
drivers/auth/crypto_mod.c \
|
|
drivers/auth/img_parser_mod.c \
|
|
lib/fconf/fconf_tbbr_getter.c
|
|
|
|
# Include the selected chain of trust sources.
|
|
ifeq (${COT},tbbr)
|
|
AUTH_SOURCES += drivers/auth/tbbr/tbbr_cot_common.c
|
|
BL1_SOURCES += drivers/auth/tbbr/tbbr_cot_bl1.c
|
|
BL2_SOURCES += drivers/auth/tbbr/tbbr_cot_bl2.c
|
|
else ifeq (${COT},dualroot)
|
|
AUTH_SOURCES += drivers/auth/dualroot/cot.c
|
|
else
|
|
$(error Unknown chain of trust ${COT})
|
|
endif
|
|
|
|
BL1_SOURCES += ${AUTH_SOURCES} \
|
|
bl1/tbbr/tbbr_img_desc.c \
|
|
plat/arm/common/arm_bl1_fwu.c \
|
|
plat/common/tbbr/plat_tbbr.c
|
|
|
|
BL2_SOURCES += ${AUTH_SOURCES} \
|
|
plat/common/tbbr/plat_tbbr.c
|
|
|
|
$(eval $(call TOOL_ADD_IMG,ns_bl2u,--fwu,FWU_))
|
|
|
|
# We expect to locate the *.mk files under the directories specified below
|
|
ifeq (${ARM_CRYPTOCELL_INTEG},0)
|
|
CRYPTO_LIB_MK := drivers/auth/mbedtls/mbedtls_crypto.mk
|
|
else
|
|
CRYPTO_LIB_MK := drivers/auth/cryptocell/cryptocell_crypto.mk
|
|
endif
|
|
IMG_PARSER_LIB_MK := drivers/auth/mbedtls/mbedtls_x509.mk
|
|
|
|
$(info Including ${CRYPTO_LIB_MK})
|
|
include ${CRYPTO_LIB_MK}
|
|
|
|
$(info Including ${IMG_PARSER_LIB_MK})
|
|
include ${IMG_PARSER_LIB_MK}
|
|
|
|
endif
|
|
|
|
ifeq (${RECLAIM_INIT_CODE}, 1)
|
|
ifeq (${ARM_XLAT_TABLES_LIB_V1}, 1)
|
|
$(error "To reclaim init code xlat tables v2 must be used")
|
|
endif
|
|
endif
|
|
|
|
ifeq (${MEASURED_BOOT},1)
|
|
MEASURED_BOOT_MK := drivers/measured_boot/measured_boot.mk
|
|
$(info Including ${MEASURED_BOOT_MK})
|
|
include ${MEASURED_BOOT_MK}
|
|
endif
|