mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-05-03 09:29:57 +00:00
09d40e0e08
Enforce full include path for includes. Deprecate old paths.
The following folders inside include/lib have been left unchanged:
- include/lib/cpus/${ARCH}
- include/lib/el3_runtime/${ARCH}
The reason for this change is that having a global namespace for
includes isn't a good idea. It defeats one of the advantages of having
folders and it introduces problems that are sometimes subtle (because
you may not know the header you are actually including if there are two
of them).
For example, this patch had to be created because two headers were
called the same way: e0ea0928d5 ("Fix gpio includes of mt8173 platform
to avoid collision."). More recently, this patch has had similar
problems: 46f9b2c3a2 ("drivers: add tzc380 support").
This problem was introduced in commit 4ecca33988 ("Move include and
source files to logical locations"). At that time, there weren't too
many headers so it wasn't a real issue. However, time has shown that
this creates problems.
Platforms that want to preserve the way they include headers may add the
removed paths to PLAT_INCLUDES, but this is discouraged.
Change-Id: I39dc53ed98f9e297a5966e723d1936d6ccf2fc8f
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
88 lines
2.6 KiB
C
88 lines
2.6 KiB
C
/*
|
|
* Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
#include <string.h>
|
|
|
|
#include <common/bl_common.h>
|
|
#include <common/debug.h>
|
|
#include <lib/mmio.h>
|
|
#include <lib/utils.h>
|
|
|
|
#include <css_def.h>
|
|
#include <plat_arm.h>
|
|
|
|
#include "../drivers/scp/css_scp.h"
|
|
|
|
/* Weak definition may be overridden in specific CSS based platform */
|
|
#pragma weak plat_arm_bl2_handle_scp_bl2
|
|
|
|
/*******************************************************************************
|
|
* Transfer SCP_BL2 from Trusted RAM using the SCP Download protocol.
|
|
* Return 0 on success, -1 otherwise.
|
|
******************************************************************************/
|
|
int plat_arm_bl2_handle_scp_bl2(image_info_t *scp_bl2_image_info)
|
|
{
|
|
int ret;
|
|
|
|
INFO("BL2: Initiating SCP_BL2 transfer to SCP\n");
|
|
|
|
ret = css_scp_boot_image_xfer((void *)scp_bl2_image_info->image_base,
|
|
scp_bl2_image_info->image_size);
|
|
|
|
if (ret == 0)
|
|
ret = css_scp_boot_ready();
|
|
|
|
if (ret == 0)
|
|
INFO("BL2: SCP_BL2 transferred to SCP\n");
|
|
else
|
|
ERROR("BL2: SCP_BL2 transfer failure\n");
|
|
|
|
return ret;
|
|
}
|
|
|
|
#if !CSS_USE_SCMI_SDS_DRIVER
|
|
# if defined(EL3_PAYLOAD_BASE) || JUNO_AARCH32_EL3_RUNTIME
|
|
|
|
/*
|
|
* We need to override some of the platform functions when booting an EL3
|
|
* payload or SP_MIN on Juno AArch32. This needs to be done only for
|
|
* SCPI/BOM SCP systems as in case of SDS, the structures remain in memory and
|
|
* don't need to be overwritten.
|
|
*/
|
|
|
|
static unsigned int scp_boot_config;
|
|
|
|
void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1,
|
|
u_register_t arg2, u_register_t arg3)
|
|
{
|
|
arm_bl2_early_platform_setup((uintptr_t)arg0, (meminfo_t *)arg1);
|
|
|
|
/* Save SCP Boot config before it gets overwritten by SCP_BL2 loading */
|
|
scp_boot_config = mmio_read_32(SCP_BOOT_CFG_ADDR);
|
|
VERBOSE("BL2: Saved SCP Boot config = 0x%x\n", scp_boot_config);
|
|
}
|
|
|
|
void bl2_platform_setup(void)
|
|
{
|
|
arm_bl2_platform_setup();
|
|
|
|
/*
|
|
* Before releasing the AP cores out of reset, the SCP writes some data
|
|
* at the beginning of the Trusted SRAM. It is is overwritten before
|
|
* reaching this function. We need to restore this data, as if the
|
|
* target had just come out of reset. This implies:
|
|
* - zeroing the first 128 bytes of Trusted SRAM using zeromem instead
|
|
* of zero_normalmem since this is device memory.
|
|
* - restoring the SCP boot configuration.
|
|
*/
|
|
VERBOSE("BL2: Restoring SCP reset data in Trusted SRAM\n");
|
|
zeromem((void *) ARM_SHARED_RAM_BASE, 128);
|
|
mmio_write_32(SCP_BOOT_CFG_ADDR, scp_boot_config);
|
|
}
|
|
|
|
# endif /* EL3_PAYLOAD_BASE */
|
|
|
|
#endif /* CSS_USE_SCMI_SDS_DRIVER */
|