mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-08-16 09:27:01 +02:00
7b56928a12
Previously, Juno used to depend on the SSC_GPRETN register to inform about the reset syndrome. This method was removed when SCP migrated to the SDS framework. But even the SDS framework doesn't report the reset syndrome correctly and hence Juno failed to enter Firmware update mode if BL2 authentication failed. In addition to that, the error code populated in V2M_SYS_NVFLAGS register does not seem to be retained any more on Juno across resets. This could be down to the motherboard firmware not doing the necessary to preserve the value. Hence this patch modifies the Juno platform to use the same mechanism to trigger firmware update as FVP which is to corrupt the FIP TOC on authentication failure. The implementation in `fvp_err.c` is made common for ARM platforms and is moved to the new `arm_err.c` file in plat/arm/common folder. The BL1 and BL2 mmap table entries for Juno are modified to allow write to the Flash memory address. Change-Id: Ica7d49a3e8a46a90efd4cf340f19fda3b549e945 Signed-off-by: Soby Mathew <soby.mathew@arm.com>
57 lines
1.6 KiB
C
57 lines
1.6 KiB
C
/*
|
|
* Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
#include <bl_common.h>
|
|
#include <errno.h>
|
|
#include <plat_arm.h>
|
|
#include <platform.h>
|
|
#include <sp805.h>
|
|
#include <tbbr_img_def.h>
|
|
#include <v2m_def.h>
|
|
|
|
void juno_reset_to_aarch32_state(void);
|
|
|
|
/*******************************************************************************
|
|
* On JUNO update the arg2 with address of SCP_BL2U image info.
|
|
******************************************************************************/
|
|
void bl1_plat_set_ep_info(unsigned int image_id,
|
|
entry_point_info_t *ep_info)
|
|
{
|
|
if (image_id == BL2U_IMAGE_ID) {
|
|
image_desc_t *image_desc = bl1_plat_get_image_desc(SCP_BL2U_IMAGE_ID);
|
|
ep_info->args.arg2 = (unsigned long)&image_desc->image_info;
|
|
}
|
|
}
|
|
|
|
/*******************************************************************************
|
|
* On Juno clear SYS_NVFLAGS and wait for watchdog reset.
|
|
******************************************************************************/
|
|
__dead2 void bl1_plat_fwu_done(void *client_cookie, void *reserved)
|
|
{
|
|
unsigned int *nv_flags_clr = (unsigned int *)
|
|
(V2M_SYSREGS_BASE + V2M_SYS_NVFLAGSCLR);
|
|
unsigned int *nv_flags_ptr = (unsigned int *)
|
|
(V2M_SYSREGS_BASE + V2M_SYS_NVFLAGS);
|
|
|
|
/* Clear the NV flags register. */
|
|
*nv_flags_clr = *nv_flags_ptr;
|
|
|
|
while (1)
|
|
wfi();
|
|
}
|
|
|
|
#if JUNO_AARCH32_EL3_RUNTIME
|
|
void bl1_plat_prepare_exit(entry_point_info_t *ep_info)
|
|
{
|
|
#if !ARM_DISABLE_TRUSTED_WDOG
|
|
/* Disable watchdog before leaving BL1 */
|
|
sp805_stop(ARM_SP805_TWDG_BASE);
|
|
#endif
|
|
|
|
juno_reset_to_aarch32_state();
|
|
}
|
|
#endif /* JUNO_AARCH32_EL3_RUNTIME */
|