Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-16 09:34:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "feat(fvp): introduce PLATFORM_TEST_EA_FFH config" into integration

Browse source
This commit is contained in:
Manish Pandey 2023-04-28 18:03:37 +02:00 • committed by TrustedFirmware Code Review
commit 48a65ec31a
2 changed files with 62 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
plat/arm/board/fvp/aarch64/fvp_ea.c Normal file
View file

@ -0,0 +1,54 @@
/*
* Copyright (c) 2023, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <inttypes.h>
#include <stdint.h>
#include <arch_helpers.h>
#include <bl31/ea_handle.h>
#include <common/bl_common.h>
#include <common/debug.h>
#include <context.h>
#include <lib/el3_runtime/context_mgmt.h>
#include <plat/common/platform.h>
/*
* This source file with custom plat_ea_handler function is compiled only when
* building TF-A with compile option PLATFORM_TEST_EA_FFH
*/
/* Test address(non-existent) used in tftf to cause External aborts */
#define TEST_ADDRESS UL(0x7FFFF000)
void plat_ea_handler(unsigned int ea_reason, uint64_t syndrome, void *cookie,
void *handle, uint64_t flags)
{
#ifdef PLATFORM_TEST_EA_FFH
u_register_t elr_el3;
u_register_t fault_address;
cpu_context_t *ctx = cm_get_context(NON_SECURE);
el3_state_t *el3_ctx = get_el3state_ctx(ctx);
gp_regs_t *gpregs_ctx = get_gpregs_ctx(ctx);
unsigned int level = (unsigned int)GET_EL(read_spsr_el3());
fault_address = read_ctx_reg(gpregs_ctx, CTX_GPREG_X0);
if ((level < MODE_EL3) && (fault_address == TEST_ADDRESS)) {
if (ea_reason == ERROR_EA_SYNC) {
INFO("Handled sync EA from lower EL at address 0x%lx\n", fault_address);
/* To avoid continuous faults, forward return address */
elr_el3 = read_ctx_reg(el3_ctx, CTX_ELR_EL3);
elr_el3 += 4;
write_ctx_reg(el3_ctx, CTX_ELR_EL3, elr_el3);
return;
} else if (ea_reason == ERROR_EA_ASYNC) {
INFO("Handled Serror from lower EL at address 0x%lx\n", fault_address);
return;
}
}
#endif
plat_default_ea_handler(ea_reason, syndrome, cookie, handle, flags);
}

8
plat/arm/board/fvp/platform.mk
View file

@ -502,3 +502,11 @@ PLAT_BL_COMMON_SOURCES += plat/arm/board/fvp/fvp_el3_spmc.c
endif
PSCI_OS_INIT_MODE := 1
$(eval $(call add_define,PLATFORM_TEST_EA_FFH))
ifeq (${PLATFORM_TEST_EA_FFH}, 1)
ifeq (${HANDLE_EA_EL3_FIRST_NS}, 0)
$(error "PLATFORM_TEST_EA_FFH expects HANDLE_EA_EL3_FIRST_NS to be 1")
endif
BL31_SOURCES += plat/arm/board/fvp/aarch64/fvp_ea.c
endif