andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat(fconf): add NS load address in configuration DTB nodes 

Retrieved the NS load address of configs from FW_CONFIG device tree,
and modified the prototype of "set_config_info" to update device tree
information with the retrieved address.

Change-Id: Ic5a98ba65bc7aa0395c70c7d450253ff8d84d02c
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
This commit is contained in:
Manish V Badarkhe 2022-03-16 09:34:36 +00:00
parent 19a9cc3a1b
commit ed4bf52c33
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/lib/fconf/fconf_dyn_cfg_getter.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2021, Arm Limited. All rights reserved.
* Copyright (c) 2019-2022, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -18,6 +18,13 @@ struct dyn_cfg_dtb_info_t {
uintptr_t config_addr;
uint32_t config_max_size;
unsigned int config_id;
/*
* Load address in non-secure memory. Only needed by those
* configuration files which require being loaded in secure
* memory (at config_addr) as well as in non-secure memory
* - e.g. HW_CONFIG
*/
uintptr_t ns_config_addr;
};
unsigned int dyn_cfg_dtb_info_get_index(unsigned int config_id);
@ -25,7 +32,8 @@ struct dyn_cfg_dtb_info_t *dyn_cfg_dtb_info_getter(unsigned int config_id);
int fconf_populate_dtb_registry(uintptr_t config);
/* Set config information in global DTB array */
void set_config_info(uintptr_t config_addr, uint32_t config_max_size,
unsigned int config_id);
void set_config_info(uintptr_t config_addr, uintptr_t ns_config_addr,
uint32_t config_max_size,
unsigned int config_id);
#endif /* FCONF_DYN_CFG_GETTER_H */

20
lib/fconf/fconf_dyn_cfg_getter.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2021, Arm Limited. All rights reserved.
* Copyright (c) 2019-2022, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -29,13 +29,15 @@ static OBJECT_POOL_ARRAY(dtb_info_pool, dtb_infos);
* This function is used to alloc memory for config information from
* global pool and set the configuration information.
*/
void set_config_info(uintptr_t config_addr, uint32_t config_max_size,
unsigned int config_id)
void set_config_info(uintptr_t config_addr, uintptr_t ns_config_addr,
uint32_t config_max_size,
unsigned int config_id)
{
struct dyn_cfg_dtb_info_t *dtb_info;
dtb_info = pool_alloc(&dtb_info_pool);
dtb_info->config_addr = config_addr;
dtb_info->ns_config_addr = ns_config_addr;
dtb_info->config_max_size = config_max_size;
dtb_info->config_id = config_id;
}
@ -88,7 +90,7 @@ int fconf_populate_dtb_registry(uintptr_t config)
*/
if (dtb_infos[0].config_id == 0U) {
uint32_t config_max_size = fdt_totalsize(dtb);
set_config_info(config, config_max_size, FW_CONFIG_ID);
set_config_info(config, ~0UL, config_max_size, FW_CONFIG_ID);
}
/* Find the node offset point to "fconf,dyn_cfg-dtb_registry" compatible property */
@ -102,6 +104,7 @@ int fconf_populate_dtb_registry(uintptr_t config)
fdt_for_each_subnode(child, dtb, node) {
uint32_t config_max_size, config_id;
uintptr_t config_addr;
uintptr_t ns_config_addr = ~0UL;
uint64_t val64;
/* Read configuration dtb information */
@ -129,7 +132,14 @@ int fconf_populate_dtb_registry(uintptr_t config)
VERBOSE("\tmax-size = 0x%x\n", config_max_size);
VERBOSE("\tconfig-id = %u\n", config_id);
set_config_info(config_addr, config_max_size, config_id);
rc = fdt_read_uint64(dtb, child, "ns-load-address", &val64);
if (rc == 0) {
ns_config_addr = (uintptr_t)val64;
VERBOSE("\tns-load-address = %lx\n", ns_config_addr);
}
set_config_info(config_addr, ns_config_addr, config_max_size,
config_id);
}
if ((child < 0) && (child != -FDT_ERR_NOTFOUND)) {