Skip to contentSkip to conversation

dm: update test on of_offset in ofnode_valid

PATCH New Patrick Delaunay 2 participants 3 messages Sep 24, 2020 – Oct 5, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dm: update test on of_offset in ofnode_valid

Update the test for node.of_offset because an invalid offset is not always set to -1 because the return value of the libfdt functions are:
+ an error with a value < 0
+ a valid offset with value >=0

For example, in ofnode_get_by_phandle() function, we have:
node.of_offset = fdt_node_offset_by_phandle(gd->fdt_blob, phandle); and this function can return -FDT_ERR_BADPHANDLE (-6).

Without this patch, the added test dm_test_ofnode_get_by_phandle failed.

---

 include/dm/ofnode.h |  2 +-
 test/dm/ofnode.c    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
include/dm/ofnode.h +1 -1
index 8df2facf99..ef3ac7f329 100644
@@ -127,7 +127,7 @@ static inline bool ofnode_valid(ofnode node)
 	if (of_live_active())
 		return node.np != NULL;
 	else
-		return node.of_offset != -1;
+		return node.of_offset >= 0;
 }
 
 /**
test/dm/ofnode.c +16 -0
index 8bfb706602..4ae8d281a7 100644
@@ -19,6 +19,22 @@ static int dm_test_ofnode_compatible(struct unit_test_state *uts)
 }
 DM_TEST(dm_test_ofnode_compatible, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);
 
+static int dm_test_ofnode_get_by_phandle(struct unit_test_state *uts)
+{
+	/* test invalid phandle */
+	ut_assert(!ofnode_valid(ofnode_get_by_phandle(0)));
+	ut_assert(!ofnode_valid(ofnode_get_by_phandle(-1)));
+
+	/* test first valid phandle */
+	ut_assert(ofnode_valid(ofnode_get_by_phandle(1)));
+
+	/* test unknown phandle */
+	ut_assert(!ofnode_valid(ofnode_get_by_phandle(0x1000000)));
+
+	return 0;
+}
+DM_TEST(dm_test_ofnode_get_by_phandle, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);
+
 static int dm_test_ofnode_by_prop_value(struct unit_test_state *uts)
 {
 	const char propname[] = "compatible";
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 dm: update test on of_offset in ofnode_valid

Quoted 10 lines · Patrick Delaunay

Update the test for node.of_offset because an invalid offset is not always set to -1 because the return value of the libfdt functions are:
+ an error with a value < 0
+ a valid offset with value >=0

For example, in ofnode_get_by_phandle() function, we have:
node.of_offset = fdt_node_offset_by_phandle(gd->fdt_blob, phandle); and this function can return -FDT_ERR_BADPHANDLE (-6).

Quoted 8 lines

Without this patch, the added test dm_test_ofnode_get_by_phandle failed.

---

 include/dm/ofnode.h |  2 +-
 test/dm/ofnode.c    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
#2 lore raw

PATCH 1/1 dm: update test on of_offset in ofnode_valid

Quoted 10 lines · Patrick Delaunay

Update the test for node.of_offset because an invalid offset is not always set to -1 because the return value of the libfdt functions are:
+ an error with a value < 0
+ a valid offset with value >=0

For example, in ofnode_get_by_phandle() function, we have:
node.of_offset = fdt_node_offset_by_phandle(gd->fdt_blob, phandle); and this function can return -FDT_ERR_BADPHANDLE (-6).

Quoted 8 lines

Without this patch, the added test dm_test_ofnode_get_by_phandle failed.

---

 include/dm/ofnode.h |  2 +-
 test/dm/ofnode.c    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

Applied to u-boot-dm/next, thanks!