diff --git a/common/fdt_wrappers.c b/common/fdt_wrappers.c index 1a726a8aaaba151b8a7b4ba682a2425fddd6ce86..1715a6f0e124f6cd09d520302872d44c4ee8a4f1 100644 --- a/common/fdt_wrappers.c +++ b/common/fdt_wrappers.c @@ -10,6 +10,7 @@ #include <debug.h> #include <fdt_wrappers.h> #include <libfdt.h> +#include <string.h> /* * Read cells from a given property of the given node. At most 2 cells of the @@ -61,6 +62,38 @@ int fdtw_read_cells(const void *dtb, int node, const char *prop, return 0; } +/* + * Read string from a given property of the given node. Up to 'size - 1' + * characters are read, and a NUL terminator is added. Returns 0 on success, + * and -1 upon error. + */ +int fdtw_read_string(const void *dtb, int node, const char *prop, + char *str, size_t size) +{ + const char *ptr; + size_t len; + + assert(dtb != NULL); + assert(node >= 0); + assert(prop != NULL); + assert(str != NULL); + assert(size > 0U); + + ptr = fdt_getprop_namelen(dtb, node, prop, (int)strlen(prop), NULL); + if (ptr == NULL) { + WARN("Couldn't find property %s in dtb\n", prop); + return -1; + } + + len = strlcpy(str, ptr, size); + if (len >= size) { + WARN("String of property %s in dtb has been truncated\n", prop); + return -1; + } + + return 0; +} + /* * Write cells in place to a given property of the given node. At most 2 cells * of the property are written. Returns 0 on success, and -1 upon error. diff --git a/include/common/fdt_wrappers.h b/include/common/fdt_wrappers.h index 3eae944e5bb8fca29047651eafb4b9eb94c04a54..a0fe6b753098405b8738f520c63dbe6b7ae7deb0 100644 --- a/include/common/fdt_wrappers.h +++ b/include/common/fdt_wrappers.h @@ -14,6 +14,9 @@ int fdtw_read_cells(const void *dtb, int node, const char *prop, unsigned int cells, void *value); +int fdtw_read_string(const void *dtb, int node, const char *prop, + char *str, size_t size); int fdtw_write_inplace_cells(void *dtb, int node, const char *prop, unsigned int cells, void *value); + #endif /* __FDT_WRAPPERS__ */