From 2747362062d4286e47cb13dbdfddfebc6d355dca Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Tue, 26 Jun 2018 10:34:07 +0100 Subject: Introduce new fdt helper to read string properties Introduced fdtw_read_string() to read string properties. Change-Id: I854eef0390632cf2eaddd2dce60cdb98c117de43 Signed-off-by: Antonio Nino Diaz --- common/fdt_wrappers.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'common/fdt_wrappers.c') diff --git a/common/fdt_wrappers.c b/common/fdt_wrappers.c index 1a726a8a..1715a6f0 100644 --- a/common/fdt_wrappers.c +++ b/common/fdt_wrappers.c @@ -10,6 +10,7 @@ #include #include #include +#include /* * 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. -- cgit v1.2.3 From 73f1ac6c8ee4a688ed8e1fddc040b882171d3453 Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Tue, 26 Jun 2018 10:34:10 +0100 Subject: Introduce fdtw_read_array() helper fdtw_read_cells() can only read one or two cells, sometimes it may be needed to read more cells from one property. Change-Id: Ie70dc76d1540cd6a04787cde7cccb4d1bafc7282 Signed-off-by: Antonio Nino Diaz --- common/fdt_wrappers.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) (limited to 'common/fdt_wrappers.c') diff --git a/common/fdt_wrappers.c b/common/fdt_wrappers.c index 1715a6f0..31dafb2e 100644 --- a/common/fdt_wrappers.c +++ b/common/fdt_wrappers.c @@ -40,7 +40,6 @@ int fdtw_read_cells(const void *dtb, int node, const char *prop, return -1; } - /* Verify that property length accords with cell length */ if (NCELLS((unsigned int)value_len) != cells) { WARN("Property length mismatch\n"); @@ -62,6 +61,45 @@ int fdtw_read_cells(const void *dtb, int node, const char *prop, return 0; } +/* + * Read cells from a given property of the given node. Any number of 32-bit + * cells of the property can be read. The fdt pointer is updated. Returns 0 on + * success, and -1 on error. + */ +int fdtw_read_array(const void *dtb, int node, const char *prop, + unsigned int cells, void *value) +{ + const uint32_t *value_ptr; + int value_len; + + assert(dtb != NULL); + assert(prop != NULL); + assert(value != NULL); + assert(node >= 0); + + /* Access property and obtain its length (in bytes) */ + value_ptr = fdt_getprop_namelen(dtb, node, prop, (int)strlen(prop), + &value_len); + if (value_ptr == NULL) { + WARN("Couldn't find property %s in dtb\n", prop); + return -1; + } + + /* Verify that property length accords with cell length */ + if (NCELLS((unsigned int)value_len) != cells) { + WARN("Property length mismatch\n"); + return -1; + } + + uint32_t *dst = value; + + for (unsigned int i = 0U; i < cells; i++) { + dst[i] = fdt32_to_cpu(value_ptr[i]); + } + + 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, -- cgit v1.2.3