diff options
| author | György Szing <gyorgy.szing@arm.com> | 2019-12-20 10:33:43 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-12-20 10:33:43 +0000 |
| commit | b8e17967bb4eaf0a28870ecb3f3b45a1e5479fe0 (patch) | |
| tree | 2044883c4b4f9280f713207793e1ffbee706b1e3 /include | |
| parent | 2f227d5156c0a0a22268c3eeb1418b87345d56ac (diff) | |
| parent | 0531ada53798d7e700410c96f1889069c35127b7 (diff) | |
| download | platform_external_arm-trusted-firmware-b8e17967bb4eaf0a28870ecb3f3b45a1e5479fe0.tar.gz platform_external_arm-trusted-firmware-b8e17967bb4eaf0a28870ecb3f3b45a1e5479fe0.tar.bz2 platform_external_arm-trusted-firmware-b8e17967bb4eaf0a28870ecb3f3b45a1e5479fe0.zip | |
Merge changes from topic "bs/pmf32" into integration
* changes:
pmf: Make the runtime instrumentation work on AArch32
SiP: Don't validate entrypoint if state switch is impossible
Diffstat (limited to 'include')
| -rw-r--r-- | include/lib/pmf/aarch32/pmf_asm_macros.S | 28 | ||||
| -rw-r--r-- | include/lib/pmf/aarch64/pmf_asm_macros.S (renamed from include/lib/pmf/pmf_asm_macros.S) | 0 |
2 files changed, 28 insertions, 0 deletions
diff --git a/include/lib/pmf/aarch32/pmf_asm_macros.S b/include/lib/pmf/aarch32/pmf_asm_macros.S new file mode 100644 index 000000000..1dbb408ca --- /dev/null +++ b/include/lib/pmf/aarch32/pmf_asm_macros.S @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2019, Arm Limited. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef PMF_ASM_MACROS_S +#define PMF_ASM_MACROS_S + +#define PMF_TS_SIZE 8 + + /* + * This macro calculates the address of the per-cpu timestamp + * for the given service name and local timestamp id. + * Clobbers: r0 - r4 + */ + .macro pmf_calc_timestamp_addr _name, _tid + mov r4, lr + bl plat_my_core_pos + mov lr, r4 + ldr r1, =__PERCPU_TIMESTAMP_SIZE__ + mov r2, #(\_tid * PMF_TS_SIZE) + mla r0, r0, r1, r2 + ldr r1, =pmf_ts_mem_\_name + add r0, r0, r1 + .endm + +#endif /* PMF_ASM_MACROS_S */ diff --git a/include/lib/pmf/pmf_asm_macros.S b/include/lib/pmf/aarch64/pmf_asm_macros.S index 5f3e6b7ec..5f3e6b7ec 100644 --- a/include/lib/pmf/pmf_asm_macros.S +++ b/include/lib/pmf/aarch64/pmf_asm_macros.S |