diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2021-10-22 14:44:42 +0200 |
|---|---|---|
| committer | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2021-11-17 08:40:49 +0100 |
| commit | 5869ebd0e87f1de987e51994103440fa8c77b26f (patch) | |
| tree | 7a9af776a210bc85de224410fa1a6c1d4a93122c | |
| parent | d5c70fa9f998af0815cdeb9e6a42682f210bbdd4 (diff) | |
| download | arm-trusted-firmware-5869ebd0e87f1de987e51994103440fa8c77b26f.tar.gz | |
fix(plat/arm): fix a VERBOSE trace
When the console verbosity is at maximum, fconf_populate_arm_sp()
prints the UUID and load address of each secure partition. However,
the load address has not been retrieved yet at this point, which means
all partitions show a zero load address.
Move the trace after we have retrieved the SP's load address from the
device tree to make it more meaningful.
Change-Id: I58ef7df6c9107a433f61113cafd8f0855c468d40
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
| -rw-r--r-- | plat/arm/common/fconf/arm_fconf_sp.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/plat/arm/common/fconf/arm_fconf_sp.c b/plat/arm/common/fconf/arm_fconf_sp.c index 552393c9b..95e08730c 100644 --- a/plat/arm/common/fconf/arm_fconf_sp.c +++ b/plat/arm/common/fconf/arm_fconf_sp.c @@ -66,6 +66,15 @@ int fconf_populate_arm_sp(uintptr_t config) } arm_sp.uuids[index] = uuid_helper; + + /* Read Load address */ + err = fdt_read_uint32(dtb, sp_node, "load-address", &val32); + if (err < 0) { + ERROR("FCONF: cannot read SP load address\n"); + return -1; + } + arm_sp.load_addr[index] = val32; + VERBOSE("FCONF: %s UUID" " %02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" " load_addr=%lx\n", @@ -82,14 +91,6 @@ int fconf_populate_arm_sp(uintptr_t config) uuid_helper.uuid_struct.node[4], uuid_helper.uuid_struct.node[5], arm_sp.load_addr[index]); - /* Read Load address */ - err = fdt_read_uint32(dtb, sp_node, "load-address", &val32); - if (err < 0) { - ERROR("FCONF: cannot read SP load address\n"); - return -1; - } - arm_sp.load_addr[index] = val32; - /* Read owner field only for dualroot CoT */ #if defined(ARM_COT_dualroot) /* Owner is an optional field, no need to catch error */ |