On 8/25/23 11:37, Michal Simek wrote:
Add helper function to allow reading a single indexed u64 value from a device-tree property containing multiple u64 values, that is an array of u64's.
Co-developed-by: Ashok Reddy Soma ashok.reddy.soma@amd.com Signed-off-by: Ashok Reddy Soma ashok.reddy.soma@amd.com Signed-off-by: Michal Simek michal.simek@amd.com
Changes in v2:
- fix kernel-doc for of_read_u64_index()
- add missing test reported by Simon
- fix debug print to print 64bit value
- convert of_read_u64 to use of_read_u64_index() as is done also for u32 version
- fix overflow size calculation
Tested on sandbox: make defconfig && make -j8 && ./u-boot --fdt arch/sandbox/dts/test.dtb --command "ut dm ofnode_u64" -v
Test: dm_test_ofnode_u64: ofnode.c Test: dm_test_ofnode_u64: ofnode.c (flat tree) Failures: 0
Based on v2023.07 tag.
arch/sandbox/dts/test.dts | 1 + drivers/core/of_access.c | 16 ++++++++++++---- drivers/core/ofnode.c | 30 ++++++++++++++++++++++++++++++ include/dm/of_access.h | 19 +++++++++++++++++++ include/dm/ofnode.h | 12 ++++++++++++ test/dm/ofnode.c | 8 ++++++++ 6 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index ff9f9222e6f9..a3c12bb09874 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -288,6 +288,7 @@ uint-value = <(-1234)>; int64-value = /bits/ 64 <0x1111222233334444>; int-array = <5678 9123 4567>;
int64-array = /bits/ 64 <0x1111222233334444 0x4444333322221111>;diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c index 81a307992c01..1d5348bf2f50 100644 --- a/drivers/core/of_access.c +++ b/drivers/core/of_access.c @@ -570,26 +570,34 @@ int of_read_u32_index(const struct device_node *np, const char *propname, return 0; }
-int of_read_u64(const struct device_node *np, const char *propname, u64 *outp) +int of_read_u64_index(const struct device_node *np, const char *propname,
int index, u64 *outp){ const __be64 *val;
debug("%s: %s: ", __func__, propname); if (!np) return -EINVAL;
- val = of_find_property_value_of_size(np, propname, sizeof(*outp));
- val = of_find_property_value_of_size(np, propname,
sizeof(*outp) * (index + 1));
- *outp = be64_to_cpup(val);
- *outp = be64_to_cpup(val + index); debug("%#llx (%lld)\n", (unsigned long long)*outp,
(unsigned long long)*outp);
(unsigned long long)*outp);return 0; }
+int of_read_u64(const struct device_node *np, const char *propname, u64 *outp) +{
- return of_read_u64_index(np, propname, 0, outp);
+}
- int of_property_match_string(const struct device_node *np, const char *propname, const char *string) {
diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index ec574c446079..e973c74af4cf 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -319,6 +319,36 @@ int ofnode_read_u32_index(ofnode node, const char *propname, int index, return 0; }
+int ofnode_read_u64_index(ofnode node, const char *propname, int index,
u64 *outp)+{
- const fdt64_t *cell;
- int len;
- assert(ofnode_valid(node));
- if (ofnode_is_np(node))
return of_read_u64_index(ofnode_to_np(node), propname, index,outp);- cell = fdt_getprop(ofnode_to_fdt(node), ofnode_to_offset(node),
propname, &len);- if (!cell) {
debug("(not found)\n");return -EINVAL;- }
- if (len < (sizeof(u64) * (index + 1))) {
debug("(not large enough)\n");return -EOVERFLOW;- }
- *outp = fdt64_to_cpu(cell[index]);
- debug("%#llx (%lld)\n", *outp, *outp);
- return 0;
+}
- u32 ofnode_read_u32_index_default(ofnode node, const char *propname, int index, u32 def) {
diff --git a/include/dm/of_access.h b/include/dm/of_access.h index c556a18f7d9c..9361d0a87bfb 100644 --- a/include/dm/of_access.h +++ b/include/dm/of_access.h @@ -333,6 +333,25 @@ int of_read_u32(const struct device_node *np, const char *propname, u32 *outp); int of_read_u32_index(const struct device_node *np, const char *propname, int index, u32 *outp);
+/**
- of_read_u64_index() - Find and read a 64-bit value from a multi-value
property
- @np: device node from which the property value is to be read.
- @propname: name of the property to be searched.
- @index: index of the u32 in the list of values
- @outp: pointer to return value, modified only if return value is 0.
- Search for a property in a device node and read a 64-bit value from
- it.
- Return:
- 0 on success, -EINVAL if the property does not exist, or -EOVERFLOW if the
- property data isn't large enough.
- */
+int of_read_u64_index(const struct device_node *np, const char *propname,
int index, u64 *outp);- /**
- of_read_u64() - Find and read a 64-bit integer from a property
diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h index 443db6252ddc..c5c244c6a476 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -424,6 +424,18 @@ int ofnode_read_u32(ofnode node, const char *propname, u32 *outp); int ofnode_read_u32_index(ofnode node, const char *propname, int index, u32 *outp);
+/**
- ofnode_read_u64_index() - Read a 64-bit integer from a multi-value property
- @node: valid node reference to read property from
- @propname: name of the property to read from
- @index: index of the integer to return
- @outp: place to put value (if found)
- Return: 0 if OK, -ve on error
- */
+int ofnode_read_u64_index(ofnode node, const char *propname, int index,
u64 *outp);- /**
- ofnode_read_s32() - Read a 32-bit integer from a property
diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c index 473a8cef5780..08b6721e926b 100644 --- a/test/dm/ofnode.c +++ b/test/dm/ofnode.c @@ -967,6 +967,14 @@ static int dm_test_ofnode_u64(struct unit_test_state *uts) ut_asserteq_64(0x1111222233334444, val); ut_asserteq(-EINVAL, ofnode_read_u64(node, "missing", &val));
- ut_assertok(ofnode_read_u64_index(node, "int64-array", 0, &val));
- ut_asserteq_64(0x1111222233334444, val);
- ut_assertok(ofnode_read_u64_index(node, "int64-array", 1, &val));
- ut_asserteq_64(0x4444333322221111, val);
- ut_asserteq(-EOVERFLOW,
ofnode_read_u64_index(node, "int64-array", 2, &val));- ut_asserteq(-EINVAL, ofnode_read_u64_index(node, "missing", 0, &val));
- return 0; } DM_TEST(dm_test_ofnode_u64, UT_TESTF_SCAN_FDT);
Applied. M