diff options
| author | Madhukar Pappireddy <madhukar.pappireddy@arm.com> | 2020-07-30 23:57:25 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-07-30 23:57:25 +0000 |
| commit | 499f192c1d31189d13fbd69fd71067555b621c53 (patch) | |
| tree | 44a82de014aa9573ec72982c8f6b2f16cad49f6d | |
| parent | f0b1864f8e309a41d2eb1c9510f8cd3c7aacbb1d (diff) | |
| parent | bef0192a2ee1e1e98199bef4e461d87f022f997a (diff) | |
| download | platform_external_arm-trusted-firmware-499f192c1d31189d13fbd69fd71067555b621c53.tar.gz platform_external_arm-trusted-firmware-499f192c1d31189d13fbd69fd71067555b621c53.tar.bz2 platform_external_arm-trusted-firmware-499f192c1d31189d13fbd69fd71067555b621c53.zip | |
Merge "fconf: spm: minor bug fix" into integration
| -rw-r--r-- | plat/arm/common/fconf/arm_fconf_sp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plat/arm/common/fconf/arm_fconf_sp.c b/plat/arm/common/fconf/arm_fconf_sp.c index 64e873e7a..3522dcf9d 100644 --- a/plat/arm/common/fconf/arm_fconf_sp.c +++ b/plat/arm/common/fconf/arm_fconf_sp.c @@ -45,6 +45,11 @@ int fconf_populate_arm_sp(uintptr_t config) } fdt_for_each_subnode(sp_node, dtb, node) { + if (index == MAX_SP_IDS) { + ERROR("FCONF: Reached max number of SPs\n"); + return -1; + } + err = fdt_read_uint32_array(dtb, sp_node, "uuid", 4, uuid_helper.word); if (err < 0) { @@ -87,15 +92,10 @@ int fconf_populate_arm_sp(uintptr_t config) policies[sp_start_index + index].check = open_fip; index++; - - if (index >= MAX_SP_IDS) { - ERROR("FCONF: reached max number of SPs\n"); - return -1; - } } if ((sp_node < 0) && (sp_node != -FDT_ERR_NOTFOUND)) { - ERROR("%d: fdt_for_each_subnode(): %d\n", __LINE__, node); + ERROR("%u: fdt_for_each_subnode(): %d\n", __LINE__, node); return sp_node; } |