test: reset: Extend base reset test to catch error

With this extended test, we get the following failure :

=> ut dm reset_base
Test: dm_test_reset_base: reset.c
test/dm/reset.c:52, dm_test_reset_base(): reset_method3.id == reset_method3_1.id: Expected 0x14 (20), got 0x2 (2)
Test: dm_test_reset_base: reset.c (flat tree)
test/dm/reset.c:52, dm_test_reset_base(): reset_method3.id == reset_method3_1.id: Expected 0x14 (20), got 0x2 (2)
Failures: 2

A fix is needed in reset_get_by_index_nodev() when introduced in [1].

[1] ea9dc35aab ("reset: Get the RESET by index without device")

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 48240aa..4fde923 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -997,8 +997,8 @@
 
        reset-ctl-test {
                compatible = "sandbox,reset-ctl-test";
-               resets = <&resetc 100>, <&resetc 2>;
-               reset-names = "other", "test";
+               resets = <&resetc 100>, <&resetc 2>, <&resetc 20>, <&resetc 40>;
+               reset-names = "other", "test", "test2", "test3";
        };
 
        rng {

diff --git a/test/dm/reset.c b/test/dm/reset.c
index fc8e925..9c00452 100644 (file)
--- a/test/dm/reset.c
+++ b/test/dm/reset.c
@@ -24,18 +24,47 @@
 static int dm_test_reset_base(struct unit_test_state *uts)
 {
        struct udevice *dev;
-       struct reset_ctl reset_method1;
-       struct reset_ctl reset_method2;
+       struct reset_ctl reset_method1, reset_method1_1;
+       struct reset_ctl reset_method2, reset_method2_1;
+       struct reset_ctl reset_method3, reset_method3_1;
+       struct reset_ctl reset_method4, reset_method4_1;
 
        /* Get the device using the reset device */
        ut_assertok(uclass_get_device_by_name(UCLASS_MISC, "reset-ctl-test",
                                              &dev));
 
        /* Get the same reset port in 2 different ways and compare */
-       ut_assertok(reset_get_by_index(dev, 1, &reset_method1));
+       ut_assertok(reset_get_by_index(dev, 0, &reset_method1));
+       ut_assertok(reset_get_by_index_nodev(dev_ofnode(dev), 0,
+                                            &reset_method1_1));
+       ut_assertok(reset_get_by_index(dev, 1, &reset_method2));
        ut_assertok(reset_get_by_index_nodev(dev_ofnode(dev), 1,
-                                            &reset_method2));
-       ut_asserteq(reset_method1.id, reset_method2.id);
+                                            &reset_method2_1));
+       ut_assertok(reset_get_by_index(dev, 2, &reset_method3));
+       ut_assertok(reset_get_by_index_nodev(dev_ofnode(dev), 2,
+                                            &reset_method3_1));
+       ut_assertok(reset_get_by_index(dev, 3, &reset_method4));
+       ut_assertok(reset_get_by_index_nodev(dev_ofnode(dev), 3,
+                                            &reset_method4_1));
+
+       ut_asserteq(reset_method1.id, reset_method1_1.id);
+       ut_asserteq(reset_method2.id, reset_method2_1.id);
+       ut_asserteq(reset_method3.id, reset_method3_1.id);
+       ut_asserteq(reset_method4.id, reset_method4_1.id);
+
+       ut_asserteq(true, reset_method1.id != reset_method2.id);
+       ut_asserteq(true, reset_method1.id != reset_method3.id);
+       ut_asserteq(true, reset_method1.id != reset_method4.id);
+       ut_asserteq(true, reset_method2.id != reset_method3.id);
+       ut_asserteq(true, reset_method2.id != reset_method4.id);
+       ut_asserteq(true, reset_method3.id != reset_method4.id);
+
+       ut_asserteq(true, reset_method1_1.id != reset_method2_1.id);
+       ut_asserteq(true, reset_method1_1.id != reset_method3_1.id);
+       ut_asserteq(true, reset_method1_1.id != reset_method4_1.id);
+       ut_asserteq(true, reset_method2_1.id != reset_method3_1.id);
+       ut_asserteq(true, reset_method2_1.id != reset_method4_1.id);
+       ut_asserteq(true, reset_method3_1.id != reset_method4_1.id);
 
        return 0;
 }