test: dm: fix broken dm_test_ofnode_phandle_ot and get_by_phandle_ot

Fix broken dm_test_ofnode_phandle_ot test. They never actually worked
and were passing test by pure luck by having the same phandle index of
test.dts that coincicentally had #gpio-cells in the same index node.

It was sufficient to add a phandle to test.dts to make the test fail.

To correctly test these feature, make use oif the new OPs oftree to
parse phandle.

For consistency with the dm_test_ofnode_phandle, rework the test and
other.dts to use the same property with the other- prefix to every
node.

Also fix dm_test_ofnode_get_by_phandle_ot by making it more robust and
renaming the phandle property to other-phandle.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/sandbox/dts/other.dts b/arch/sandbox/dts/other.dts
index 395a792..b32158c 100644 (file)
--- a/arch/sandbox/dts/other.dts
+++ b/arch/sandbox/dts/other.dts
@@ -8,13 +8,15 @@
 
 /dts-v1/;
 
+#include <dt-bindings/gpio/gpio.h>
+
 / {
        compatible = "sandbox-other";
        #address-cells = <1>;
        #size-cells = <1>;
 
        node {
-               target = <&target 3 4>;
+               other-phandle = <&target>;
 
                subnode {
                        compatible = "sandbox-other2";
@@ -25,9 +27,27 @@
                };
        };
 
+       other-a-test {
+               other-test-gpios = <&other_gpio_a 1>, <&other_gpio_a 4>,
+                       <&other_gpio_b 5 GPIO_ACTIVE_HIGH 3 2 1>,
+                       <0>, <&other_gpio_a 12>;
+               other-phandle-value = <&other_gpio_c 10>, <0xFFFFFFFF 20>, <&other_gpio_a 30>;
+       };
+
+       other_gpio_a: other-gpio-a {
+               #gpio-cells = <1>;
+       };
+
+       other_gpio_b: other-gpio-b {
+               #gpio-cells = <5>;
+       };
+
+       other_gpio_c: other-gpio-c {
+               #gpio-cells = <2>;
+       };
+
        target: target {
                compatible = "sandbox-other2";
-               #gpio-cells = <2>;
                str-prop = "other";
                reg = <0x8000 0x100>;
                status = "disabled";

diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c
index ce99656..24b67bb 100644 (file)
--- a/test/dm/ofnode.c
+++ b/test/dm/ofnode.c
@@ -141,9 +141,16 @@ static int dm_test_ofnode_get_by_phandle_ot(struct unit_test_state *uts)
 {
        oftree otree = get_other_oftree(uts);
        ofnode node;
+       u32 idx;
+       int ret;
 
-       ut_assert(ofnode_valid(oftree_get_by_phandle(oftree_default(), 1)));
-       node = oftree_get_by_phandle(otree, 1);
+       node = oftree_path(otree, "/node");
+       ut_assert(ofnode_valid(node));
+
+       ret = ofnode_read_u32(node, "other-phandle", &idx);
+       ut_assertok(ret);
+
+       node = oftree_get_by_phandle(otree, idx);
        ut_assert(ofnode_valid(node));
        ut_asserteq_str("target", ofnode_get_name(node));
 
@@ -349,30 +356,78 @@ static int dm_test_ofnode_phandle(struct unit_test_state *uts)
 }
 DM_TEST(dm_test_ofnode_phandle, UTF_SCAN_PDATA | UTF_SCAN_FDT);
 
-/* test ofnode_count_/parse_phandle_with_args() with 'other' tree */
+/* test oftree_count_/parse_phandle_with_args() with 'other' tree */
 static int dm_test_ofnode_phandle_ot(struct unit_test_state *uts)
 {
        oftree otree = get_other_oftree(uts);
        struct ofnode_phandle_args args;
        ofnode node;
        int ret;
+       const char prop[] = "other-test-gpios";
+       const char cell[] = "#gpio-cells";
+       const char prop2[] = "other-phandle-value";
 
-       node = oftree_path(otree, "/node");
+       node = oftree_path(otree, "/other-a-test");
+       ut_assert(ofnode_valid(node));
 
-       /* Test ofnode_count_phandle_with_args with cell name */
-       ret = ofnode_count_phandle_with_args(node, "missing", "#gpio-cells", 0);
+       /* Test oftree_count_phandle_with_args with cell name */
+       ret = oftree_count_phandle_with_args(otree, node, "missing", cell, 0);
        ut_asserteq(-ENOENT, ret);
-       ret = ofnode_count_phandle_with_args(node, "target", "#invalid", 0);
+       ret = oftree_count_phandle_with_args(otree, node, prop, "#invalid", 0);
        ut_asserteq(-EINVAL, ret);
-       ret = ofnode_count_phandle_with_args(node, "target", "#gpio-cells", 0);
-       ut_asserteq(1, ret);
+       ret = oftree_count_phandle_with_args(otree, node, prop, cell, 0);
+       ut_asserteq(5, ret);
+
+       /* Test oftree_parse_phandle_with_args with cell name */
+       ret = oftree_parse_phandle_with_args(otree, node, "missing", cell, 0, 0,
+                                            &args);
+       ut_asserteq(-ENOENT, ret);
+       ret = oftree_parse_phandle_with_args(otree, node, prop, "#invalid", 0, 0,
+                                            &args);
+       ut_asserteq(-EINVAL, ret);
+       ret = oftree_parse_phandle_with_args(otree, node, prop, cell, 0, 0, &args);
+       ut_assertok(ret);
+       ut_asserteq(1, args.args_count);
+       ut_asserteq(1, args.args[0]);
+       ret = oftree_parse_phandle_with_args(otree, node, prop, cell, 0, 1, &args);
+       ut_assertok(ret);
+       ut_asserteq(1, args.args_count);
+       ut_asserteq(4, args.args[0]);
+       ret = oftree_parse_phandle_with_args(otree, node, prop, cell, 0, 2, &args);
+       ut_assertok(ret);
+       ut_asserteq(5, args.args_count);
+       ut_asserteq(5, args.args[0]);
+       ut_asserteq(1, args.args[4]);
+       ret = oftree_parse_phandle_with_args(otree, node, prop, cell, 0, 3, &args);
+       ut_asserteq(-ENOENT, ret);
+       ret = oftree_parse_phandle_with_args(otree, node, prop, cell, 0, 4, &args);
+       ut_assertok(ret);
+       ut_asserteq(1, args.args_count);
+       ut_asserteq(12, args.args[0]);
+       ret = oftree_parse_phandle_with_args(otree, node, prop, cell, 0, 5, &args);
+       ut_asserteq(-ENOENT, ret);
+
+       /* Test oftree_count_phandle_with_args with cell count */
+       ret = oftree_count_phandle_with_args(otree, node, "missing", NULL, 2);
+       ut_asserteq(-ENOENT, ret);
+       ret = oftree_count_phandle_with_args(otree, node, prop2, NULL, 1);
+       ut_asserteq(3, ret);
 
-       ret = ofnode_parse_phandle_with_args(node, "target", "#gpio-cells", 0,
-                                            0, &args);
+       /* Test oftree_parse_phandle_with_args with cell count */
+       ret = oftree_parse_phandle_with_args(otree, node, prop2, NULL, 1, 0, &args);
        ut_assertok(ret);
-       ut_asserteq(2, args.args_count);
-       ut_asserteq(3, args.args[0]);
-       ut_asserteq(4, args.args[1]);
+       ut_asserteq(1, ofnode_valid(args.node));
+       ut_asserteq(1, args.args_count);
+       ut_asserteq(10, args.args[0]);
+       ret = oftree_parse_phandle_with_args(otree, node, prop2, NULL, 1, 1, &args);
+       ut_asserteq(-EINVAL, ret);
+       ret = oftree_parse_phandle_with_args(otree, node, prop2, NULL, 1, 2, &args);
+       ut_assertok(ret);
+       ut_asserteq(1, ofnode_valid(args.node));
+       ut_asserteq(1, args.args_count);
+       ut_asserteq(30, args.args[0]);
+       ret = oftree_parse_phandle_with_args(otree, node, prop2, NULL, 1, 3, &args);
+       ut_asserteq(-ENOENT, ret);
 
        return 0;
 }