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

sgi/dyncfg: add system-id node in hw-config dtb 

Append a node to hw-config dtb which will include a property to hold
the value of the SSC_VERSION register. This will be used by the BL33
stage to determine the platform-id and the config-id of the platform
it is executing on.

Change-Id: Ie7b1e5d8c1bbe0efdb7ef0714f14b7794ec6058e
Signed-off-by: Amit Daniel Kachhap <amit.kachhap@arm.com>
Signed-off-by: Chandni Cherukuri <chandni.cherukuri@arm.com>
This commit is contained in:
Chandni Cherukuri 2018-05-10 12:03:50 +05:30
parent 39b66f68d8
commit ea3f1be5bd
2 changed files with 89 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plat/arm/css/sgi/sgi-common.mk
View File

@ -30,7 +30,8 @@ BL1_SOURCES += ${INTERCONNECT_SOURCES} \
${CSS_ENT_BASE}/sgi_bl1_setup.c \
${CSS_ENT_BASE}/sgi_plat_config.c
BL2_SOURCES += ${CSS_ENT_BASE}/sgi_security.c
BL2_SOURCES += ${CSS_ENT_BASE}/sgi_security.c \
${CSS_ENT_BASE}/sgi_image_load.c
BL31_SOURCES += ${ENT_CPU_SOURCES} \
${INTERCONNECT_SOURCES} \

87
plat/arm/css/sgi/sgi_image_load.c Normal file
View File

@ -0,0 +1,87 @@
/*
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <debug.h>
#include <desc_image_load.h>
#include <libfdt.h>
#include <platform.h>
/*******************************************************************************
* This function inserts Platform information via device tree nodes as,
* system-id {
* platform-id = <0>;
* }
******************************************************************************/
static int plat_sgi_append_config_node(void)
{
bl_mem_params_node_t *mem_params;
void *fdt;
int nodeoffset, err;
unsigned int platid = 0;
char *platform_name;
mem_params = get_bl_mem_params_node(HW_CONFIG_ID);
if (mem_params == NULL) {
ERROR("HW CONFIG base address is NULL");
return -1;
}
fdt = (void *)(mem_params->image_info.image_base);
/* Check the validity of the fdt */
if (fdt_check_header(fdt) != 0) {
ERROR("Invalid HW_CONFIG DTB passed\n");
return -1;
}
platform_name = (char *)fdt_getprop(fdt, 0, "compatible", NULL);
if (strcmp(platform_name, "arm,sgi575") == 0) {
platid = mmio_read_32(SSC_VERSION);
} else {
WARN("Invalid platform \n");
return -1;
}
/* Increase DTB blob by 512 byte */
err = fdt_open_into(fdt, fdt, mem_params->image_info.image_size + 512);
if (err < 0) {
ERROR("Failed to open HW_CONFIG DTB\n");
return -1;
}
/* Create "/system-id" node */
nodeoffset = fdt_add_subnode(fdt, 0, "system-id");
if (nodeoffset < 0) {
ERROR("Failed to add node system-id\n");
return -1;
}
err = fdt_setprop_u32(fdt, nodeoffset, "platform-id", platid);
if (err < 0) {
ERROR("Failed to add node platform-id\n");
return -1;
}
return 0;
}
/*******************************************************************************
* This function returns the list of executable images.
******************************************************************************/
bl_params_t *plat_get_next_bl_params(void)
{
int ret;
bl_params_t *next_bl_params;
ret = plat_sgi_append_config_node();
if (ret != 0)
panic();
next_bl_params = get_next_bl_params_from_mem_params_desc();
populate_next_bl_params_config(next_bl_params);
return next_bl_params;
}