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

FDT helper functions: Fix MISRA issues 

Moving the FDT helper functions to the common/ directory exposed the file
to MISRA checking, which is mandatory for common code.

Fix the complaints that the test suite reported.

Change-Id: Ica8c8a95218bba5a3fd92a55407de24df58e8476
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
This commit is contained in:
Andre Przywara 2019-09-16 16:50:57 +01:00 committed by Sandrine Bailleux
parent e5eaf885cc
commit feb358b651
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/fdt_fixup.c
View File

@ -95,7 +95,7 @@ int dt_add_psci_node(void *fdt)
* or none have to be patched in the first place.
* Returns 1 if *one* such subnode has been found and successfully changed
* to "psci".
* Returns -1 on error.
* Returns negative values on error.
*
* Call in a loop until it returns 0. Recalculate the node offset after
* it has returned 1.
@ -109,20 +109,23 @@ static int dt_update_one_cpu_node(void *fdt, int offset)
offs = fdt_next_subnode(fdt, offs)) {
const char *prop;
int len;
int ret;
prop = fdt_getprop(fdt, offs, "device_type", &len);
if (!prop)
if (prop == NULL)
continue;
if (memcmp(prop, "cpu", 4) != 0 || len != 4)
if ((strcmp(prop, "cpu") != 0) || (len != 4))
continue;
/* Ignore any nodes which already use "psci". */
prop = fdt_getprop(fdt, offs, "enable-method", &len);
if (prop && memcmp(prop, "psci", 5) == 0 && len == 5)
if ((prop != NULL) &&
(strcmp(prop, "psci") == 0) && (len == 5))
continue;
if (fdt_setprop_string(fdt, offs, "enable-method", "psci"))
return -1;
ret = fdt_setprop_string(fdt, offs, "enable-method", "psci");
if (ret < 0)
return ret;
/*
* Subnode found and patched.
* Restart to accommodate potentially changed offsets.