mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-08-19 21:40:59 +02:00
25ac87940c
This patch introduces a better separation between the trusted-boot related properties, and the dynamic configuration DTBs loading information. The dynamic configuration DTBs properties are moved to a new node: `dtb-registry`. All the sub-nodes present will be provided to the dynamic config framework to be loaded. The node currently only contains the already defined configuration DTBs, but can be extended for future features if necessary. The dynamic config framework is modified to use the abstraction provided by the fconf framework, instead of directly accessing the DTBs. The trusted-boot properties are kept under the "arm,tb_fw" compatible string, but in a separate `tb_fw-config` node. The `tb_fw-config` property of the `dtb-registry` node simply points to the load address of `fw_config`, as the `tb_fw-config` is currently part of the same DTB. Change-Id: Iceb6c4c2cb92b692b6e28dbdc9fb060f1c46de82 Signed-off-by: Louis Mayencourt <louis.mayencourt@arm.com>
86 lines
2.3 KiB
C
86 lines
2.3 KiB
C
/*
|
|
* Copyright (c) 2019-2020, ARM Limited. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
#include <assert.h>
|
|
|
|
#include <common/debug.h>
|
|
#include <common/fdt_wrappers.h>
|
|
#include <lib/fconf/fconf.h>
|
|
#include <libfdt.h>
|
|
#include <plat/common/platform.h>
|
|
#include <platform_def.h>
|
|
|
|
struct fconf_dtb_info_t fconf_dtb_info;
|
|
|
|
void fconf_load_config(void)
|
|
{
|
|
int err;
|
|
/* fconf FW_CONFIG and TB_FW_CONFIG are currently the same DTB */
|
|
image_info_t arm_tb_fw_info = {
|
|
.h.type = (uint8_t)PARAM_IMAGE_BINARY,
|
|
.h.version = (uint8_t)VERSION_2,
|
|
.h.size = (uint16_t)sizeof(image_info_t),
|
|
.h.attr = 0,
|
|
.image_base = ARM_TB_FW_CONFIG_BASE,
|
|
.image_max_size = (uint32_t)
|
|
(ARM_TB_FW_CONFIG_LIMIT - ARM_TB_FW_CONFIG_BASE)
|
|
};
|
|
|
|
VERBOSE("FCONF: Loading FW_CONFIG\n");
|
|
err = load_auth_image(TB_FW_CONFIG_ID, &arm_tb_fw_info);
|
|
if (err != 0) {
|
|
/* Return if FW_CONFIG is not loaded */
|
|
VERBOSE("Failed to load FW_CONFIG\n");
|
|
return;
|
|
}
|
|
|
|
/* At this point we know that a DTB is indeed available */
|
|
fconf_dtb_info.base_addr = arm_tb_fw_info.image_base;
|
|
fconf_dtb_info.size = (size_t)arm_tb_fw_info.image_size;
|
|
|
|
#if !BL2_AT_EL3
|
|
image_desc_t *desc;
|
|
|
|
/* The BL2 ep_info arg0 is modified to point to FW_CONFIG */
|
|
desc = bl1_plat_get_image_desc(BL2_IMAGE_ID);
|
|
assert(desc != NULL);
|
|
desc->ep_info.args.arg0 = arm_tb_fw_info.image_base;
|
|
#endif
|
|
|
|
INFO("FCONF: FW_CONFIG loaded at address = 0x%lx\n", arm_tb_fw_info.image_base);
|
|
}
|
|
|
|
void fconf_populate(uintptr_t config)
|
|
{
|
|
assert(config != 0UL);
|
|
|
|
/* Check if the pointer to DTB is correct */
|
|
if (fdt_check_header((void *)config) != 0) {
|
|
ERROR("FCONF: Invalid DTB file passed for FW_CONFIG\n");
|
|
panic();
|
|
}
|
|
|
|
INFO("FCONF: Reading firmware configuration file from: 0x%lx\n", config);
|
|
|
|
/* Go through all registered populate functions */
|
|
IMPORT_SYM(struct fconf_populator *, __FCONF_POPULATOR_START__, start);
|
|
IMPORT_SYM(struct fconf_populator *, __FCONF_POPULATOR_END__, end);
|
|
const struct fconf_populator *populator;
|
|
|
|
for (populator = start; populator != end; populator++) {
|
|
assert((populator->info != NULL) && (populator->populate != NULL));
|
|
|
|
INFO("FCONF: Reading firmware configuration information for: %s\n", populator->info);
|
|
if (populator->populate(config) != 0) {
|
|
/* TODO: handle property miss */
|
|
panic();
|
|
}
|
|
}
|
|
|
|
/* save local pointer to the config dtb */
|
|
fconf_dtb_info.base_addr = config;
|
|
}
|