Browse Source
Use the firmware configuration framework to store the io_policies information inside the configuration device tree instead of the static structure in the code base. The io_policies required by BL1 can't be inside the dtb, as this one is loaded by BL1, and only available at BL2. This change currently only applies to FVP platform. Change-Id: Ic9c1ac3931a4a136aa36f7f58f66d3764c1bfca1 Signed-off-by: Louis Mayencourt <louis.mayencourt@arm.com>pull/1938/head
Louis Mayencourt
5 years ago
12 changed files with 386 additions and 5 deletions
@ -0,0 +1,24 @@ |
|||
/*
|
|||
* Copyright (c) 2019-2020, ARM Limited. All rights reserved. |
|||
* |
|||
* SPDX-License-Identifier: BSD-3-Clause |
|||
*/ |
|||
|
|||
#ifndef ARM_FCONF_GETTER |
|||
#define ARM_FCONF_GETTER |
|||
|
|||
#include <lib/fconf/fconf.h> |
|||
|
|||
/* ARM io policies */ |
|||
#define arm__io_policies_getter(id) &policies[id] |
|||
|
|||
struct plat_io_policy { |
|||
uintptr_t *dev_handle; |
|||
uintptr_t image_spec; |
|||
int (*check)(const uintptr_t spec); |
|||
}; |
|||
|
|||
extern struct plat_io_policy policies[]; |
|||
int fconf_populate_arm_io_policies(uintptr_t config); |
|||
|
|||
#endif /* ARM_FCONF_GETTER */ |
|||
@ -0,0 +1,19 @@ |
|||
/*
|
|||
* Copyright (c) 2020, ARM Limited. All rights reserved. |
|||
* |
|||
* SPDX-License-Identifier: BSD-3-Clause |
|||
*/ |
|||
#ifndef ARM_FCONF_IO_STORAGE_H |
|||
#define ARM_FCONF_IO_STORAGE_H |
|||
|
|||
#include <stdint.h> |
|||
|
|||
/* IO devices handle */ |
|||
extern uintptr_t memmap_dev_handle; |
|||
extern uintptr_t fip_dev_handle; |
|||
|
|||
/* Function declarations */ |
|||
int open_fip(const uintptr_t spec); |
|||
int open_memmap(const uintptr_t spec); |
|||
|
|||
#endif /* ARM_FCONF_IO_STORAGE_H */ |
|||
@ -0,0 +1,142 @@ |
|||
/*
|
|||
* Copyright (c) 2015-2020, ARM Limited. All rights reserved. |
|||
* |
|||
* SPDX-License-Identifier: BSD-3-Clause |
|||
*/ |
|||
|
|||
#include <assert.h> |
|||
|
|||
#include <common/debug.h> |
|||
#include <drivers/io/io_driver.h> |
|||
#include <drivers/io/io_fip.h> |
|||
#include <drivers/io/io_memmap.h> |
|||
#include <drivers/io/io_storage.h> |
|||
#include <lib/utils.h> |
|||
#include <tools_share/firmware_image_package.h> |
|||
|
|||
#include <plat/arm/common/arm_fconf_getter.h> |
|||
#include <plat/arm/common/arm_fconf_io_storage.h> |
|||
#include <plat/arm/common/plat_arm.h> |
|||
#include <plat/common/platform.h> |
|||
#include <platform_def.h> |
|||
|
|||
/* IO devices */ |
|||
static const io_dev_connector_t *fip_dev_con; |
|||
uintptr_t fip_dev_handle; |
|||
static const io_dev_connector_t *memmap_dev_con; |
|||
uintptr_t memmap_dev_handle; |
|||
|
|||
/* Weak definitions may be overridden in specific ARM standard platform */ |
|||
#pragma weak plat_arm_io_setup |
|||
#pragma weak plat_arm_get_alt_image_source |
|||
|
|||
int open_fip(const uintptr_t spec) |
|||
{ |
|||
int result; |
|||
uintptr_t local_image_handle; |
|||
|
|||
/* See if a Firmware Image Package is available */ |
|||
result = io_dev_init(fip_dev_handle, (uintptr_t)FIP_IMAGE_ID); |
|||
if (result == 0) { |
|||
result = io_open(fip_dev_handle, spec, &local_image_handle); |
|||
if (result == 0) { |
|||
VERBOSE("Using FIP\n"); |
|||
io_close(local_image_handle); |
|||
} |
|||
} |
|||
return result; |
|||
} |
|||
|
|||
int open_memmap(const uintptr_t spec) |
|||
{ |
|||
int result; |
|||
uintptr_t local_image_handle; |
|||
|
|||
result = io_dev_init(memmap_dev_handle, (uintptr_t)NULL); |
|||
if (result == 0) { |
|||
result = io_open(memmap_dev_handle, spec, &local_image_handle); |
|||
if (result == 0) { |
|||
VERBOSE("Using Memmap\n"); |
|||
io_close(local_image_handle); |
|||
} |
|||
} |
|||
return result; |
|||
} |
|||
|
|||
void arm_io_setup(void) |
|||
{ |
|||
int io_result; |
|||
|
|||
io_result = register_io_dev_fip(&fip_dev_con); |
|||
assert(io_result == 0); |
|||
|
|||
io_result = register_io_dev_memmap(&memmap_dev_con); |
|||
assert(io_result == 0); |
|||
|
|||
/* Open connections to devices and cache the handles */ |
|||
io_result = io_dev_open(fip_dev_con, (uintptr_t)NULL, |
|||
&fip_dev_handle); |
|||
assert(io_result == 0); |
|||
|
|||
io_result = io_dev_open(memmap_dev_con, (uintptr_t)NULL, |
|||
&memmap_dev_handle); |
|||
assert(io_result == 0); |
|||
|
|||
/* Ignore improbable errors in release builds */ |
|||
(void)io_result; |
|||
} |
|||
|
|||
void plat_arm_io_setup(void) |
|||
{ |
|||
arm_io_setup(); |
|||
} |
|||
|
|||
int plat_arm_get_alt_image_source( |
|||
unsigned int image_id __unused, |
|||
uintptr_t *dev_handle __unused, |
|||
uintptr_t *image_spec __unused) |
|||
{ |
|||
/* By default do not try an alternative */ |
|||
return -ENOENT; |
|||
} |
|||
|
|||
/* Return an IO device handle and specification which can be used to access
|
|||
* an image. Use this to enforce platform load policy */ |
|||
int plat_get_image_source(unsigned int image_id, uintptr_t *dev_handle, |
|||
uintptr_t *image_spec) |
|||
{ |
|||
int result; |
|||
const struct plat_io_policy *policy; |
|||
|
|||
assert(image_id < MAX_NUMBER_IDS); |
|||
|
|||
policy = FCONF_GET_PROPERTY(arm, io_policies, image_id); |
|||
result = policy->check(policy->image_spec); |
|||
if (result == 0) { |
|||
*image_spec = policy->image_spec; |
|||
*dev_handle = *(policy->dev_handle); |
|||
} else { |
|||
VERBOSE("Trying alternative IO\n"); |
|||
result = plat_arm_get_alt_image_source(image_id, dev_handle, |
|||
image_spec); |
|||
} |
|||
|
|||
return result; |
|||
} |
|||
|
|||
/*
|
|||
* See if a Firmware Image Package is available, |
|||
* by checking if TOC is valid or not. |
|||
*/ |
|||
int arm_io_is_toc_valid(void) |
|||
{ |
|||
int result; |
|||
|
|||
result = io_dev_init(fip_dev_handle, (uintptr_t)FIP_IMAGE_ID); |
|||
|
|||
if (result == 0) { |
|||
return 1UL; |
|||
} else { |
|||
return 0UL; |
|||
} |
|||
} |
|||
@ -0,0 +1,143 @@ |
|||
/*
|
|||
* 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 <drivers/io/io_storage.h> |
|||
#include <lib/object_pool.h> |
|||
#include <libfdt.h> |
|||
#include <tools_share/firmware_image_package.h> |
|||
|
|||
#include <plat/arm/common/arm_fconf_getter.h> |
|||
#include <plat/arm/common/arm_fconf_io_storage.h> |
|||
#include <platform_def.h> |
|||
|
|||
const io_block_spec_t fip_block_spec = { |
|||
.offset = PLAT_ARM_FIP_BASE, |
|||
.length = PLAT_ARM_FIP_MAX_SIZE |
|||
}; |
|||
|
|||
const io_uuid_spec_t arm_uuid_spec[MAX_NUMBER_IDS] = { |
|||
[BL2_IMAGE_ID] = {UUID_TRUSTED_BOOT_FIRMWARE_BL2}, |
|||
[TB_FW_CONFIG_ID] = {UUID_TB_FW_CONFIG}, |
|||
#if TRUSTED_BOARD_BOOT |
|||
[TRUSTED_BOOT_FW_CERT_ID] = {UUID_TRUSTED_BOOT_FW_CERT}, |
|||
#endif /* TRUSTED_BOARD_BOOT */ |
|||
}; |
|||
|
|||
/* By default, ARM platforms load images from the FIP */ |
|||
struct plat_io_policy policies[MAX_NUMBER_IDS] = { |
|||
[FIP_IMAGE_ID] = { |
|||
&memmap_dev_handle, |
|||
(uintptr_t)&fip_block_spec, |
|||
open_memmap |
|||
}, |
|||
[BL2_IMAGE_ID] = { |
|||
&fip_dev_handle, |
|||
(uintptr_t)&arm_uuid_spec[BL2_IMAGE_ID], |
|||
open_fip |
|||
}, |
|||
[TB_FW_CONFIG_ID] = { |
|||
&fip_dev_handle, |
|||
(uintptr_t)&arm_uuid_spec[TB_FW_CONFIG_ID], |
|||
open_fip |
|||
}, |
|||
#if TRUSTED_BOARD_BOOT |
|||
[TRUSTED_BOOT_FW_CERT_ID] = { |
|||
&fip_dev_handle, |
|||
(uintptr_t)&arm_uuid_spec[TRUSTED_BOOT_FW_CERT_ID], |
|||
open_fip |
|||
}, |
|||
#endif /* TRUSTED_BOARD_BOOT */ |
|||
}; |
|||
|
|||
#ifdef IMAGE_BL2 |
|||
|
|||
#if TRUSTED_BOARD_BOOT |
|||
#define FCONF_ARM_IO_UUID_NUMBER 19 |
|||
#else |
|||
#define FCONF_ARM_IO_UUID_NUMBER 10 |
|||
#endif |
|||
|
|||
static io_uuid_spec_t fconf_arm_uuids[FCONF_ARM_IO_UUID_NUMBER]; |
|||
static OBJECT_POOL_ARRAY(fconf_arm_uuids_pool, fconf_arm_uuids); |
|||
|
|||
struct policies_load_info { |
|||
unsigned int image_id; |
|||
const char *name; |
|||
}; |
|||
|
|||
/* image id to property name table */ |
|||
static const struct policies_load_info load_info[FCONF_ARM_IO_UUID_NUMBER] = { |
|||
{SCP_BL2_IMAGE_ID, "scp_bl2_uuid"}, |
|||
{BL31_IMAGE_ID, "bl31_uuid"}, |
|||
{BL32_IMAGE_ID, "bl32_uuid"}, |
|||
{BL32_EXTRA1_IMAGE_ID, "bl32_extra1_uuid"}, |
|||
{BL32_EXTRA2_IMAGE_ID, "bl32_extra2_uuid"}, |
|||
{BL33_IMAGE_ID, "bl33_uuid"}, |
|||
{HW_CONFIG_ID, "hw_cfg_uuid"}, |
|||
{SOC_FW_CONFIG_ID, "soc_fw_cfg_uuid"}, |
|||
{TOS_FW_CONFIG_ID, "tos_fw_cfg_uuid"}, |
|||
{NT_FW_CONFIG_ID, "nt_fw_cfg_uuid"}, |
|||
#if TRUSTED_BOARD_BOOT |
|||
{TRUSTED_KEY_CERT_ID, "t_key_cert_uuid"}, |
|||
{SCP_FW_KEY_CERT_ID, "scp_fw_key_uuid"}, |
|||
{SOC_FW_KEY_CERT_ID, "soc_fw_key_uuid"}, |
|||
{TRUSTED_OS_FW_KEY_CERT_ID, "tos_fw_key_cert_uuid"}, |
|||
{NON_TRUSTED_FW_KEY_CERT_ID, "nt_fw_key_cert_uuid"}, |
|||
{SCP_FW_CONTENT_CERT_ID, "scp_fw_content_cert_uuid"}, |
|||
{SOC_FW_CONTENT_CERT_ID, "soc_fw_content_cert_uuid"}, |
|||
{TRUSTED_OS_FW_CONTENT_CERT_ID, "tos_fw_content_cert_uuid"}, |
|||
{NON_TRUSTED_FW_CONTENT_CERT_ID, "nt_fw_content_cert_uuid"}, |
|||
#endif /* TRUSTED_BOARD_BOOT */ |
|||
}; |
|||
|
|||
int fconf_populate_arm_io_policies(uintptr_t config) |
|||
{ |
|||
int err, node; |
|||
unsigned int i; |
|||
|
|||
union uuid_helper_t uuid_helper; |
|||
io_uuid_spec_t *uuid_ptr; |
|||
|
|||
/* As libfdt uses void *, we can't avoid this cast */ |
|||
const void *dtb = (void *)config; |
|||
|
|||
/* Assert the node offset point to "arm,io-fip-handle" compatible property */ |
|||
const char *compatible_str = "arm,io-fip-handle"; |
|||
node = fdt_node_offset_by_compatible(dtb, -1, compatible_str); |
|||
if (node < 0) { |
|||
ERROR("FCONF: Can't find %s compatible in dtb\n", compatible_str); |
|||
return node; |
|||
} |
|||
|
|||
/* Locate the uuid cells and read the value for all the load info uuid */ |
|||
for (i = 0; i < FCONF_ARM_IO_UUID_NUMBER; i++) { |
|||
uuid_ptr = pool_alloc(&fconf_arm_uuids_pool); |
|||
err = fdtw_read_array(dtb, node, load_info[i].name, 4, &uuid_helper.word); |
|||
if (err < 0) { |
|||
WARN("FCONF: Read cell failed for %s\n", load_info[i].name); |
|||
return err; |
|||
} |
|||
|
|||
VERBOSE("FCONF: arm-io_policies.%s cell found with value = 0x%x 0x%x 0x%x 0x%x\n", |
|||
load_info[i].name, |
|||
uuid_helper.word[0], uuid_helper.word[1], |
|||
uuid_helper.word[2], uuid_helper.word[3]); |
|||
|
|||
uuid_ptr->uuid = uuid_helper.uuid_struct; |
|||
policies[load_info[i].image_id].image_spec = (uintptr_t)uuid_ptr; |
|||
policies[load_info[i].image_id].dev_handle = &fip_dev_handle; |
|||
policies[load_info[i].image_id].check = open_fip; |
|||
} |
|||
return 0; |
|||
} |
|||
|
|||
FCONF_REGISTER_POPULATOR(arm_io, fconf_populate_arm_io_policies); |
|||
|
|||
#endif /* IMAGE_BL2 */ |
|||
Loading…
Reference in new issue