of: unittest: Use bigger address cells to catch parser regressions

Getting address and size cells for dma-ranges/ranges parsing is tricky
and shouldn't rely on the node's count_cells() method. The function
starts looking for cells on the parent node, as its supposed to work
with device nodes, which doesn't work when input with bus nodes, as
generally done when parsing ranges.

Add test to catch regressions on that specific quirk as developers will
be tempted to edit it out in favor of the default method.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/9200970a917a9cabdc5b17483b5a8725111eb9d0.camel@suse.de
Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/drivers/of/unittest-data/tests-address.dtsi b/drivers/of/unittest-data/tests-address.dtsi
index 3fe5d39..6604a52 100644 (file)
--- a/drivers/of/unittest-data/tests-address.dtsi
+++ b/drivers/of/unittest-data/tests-address.dtsi
@@ -23,13 +23,13 @@
                        };
 
                        bus@80000000 {
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               ranges = <0x0 0x80000000 0x100000>;
-                               dma-ranges = <0x10000000 0x0 0x40000000>;
+                               #address-cells = <2>;
+                               #size-cells = <2>;
+                               ranges = <0x0 0x0 0x80000000 0x0 0x100000>;
+                               dma-ranges = <0x1 0x0 0x0 0x20 0x0>;
 
                                device@1000 {
-                                       reg = <0x1000 0x1000>;
+                                       reg = <0x0 0x1000 0x0 0x1000>;
                                };
                        };
 

diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 398de04..9b7e84b 100644 (file)
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -900,7 +900,7 @@ static void __init of_unittest_parse_dma_ranges(void)
        of_unittest_dma_ranges_one("/testcase-data/address-tests/device@70000000",
                0x0, 0x20000000, 0x40000000);
        of_unittest_dma_ranges_one("/testcase-data/address-tests/bus@80000000/device@1000",
-               0x10000000, 0x20000000, 0x40000000);
+               0x100000000, 0x20000000, 0x2000000000);
        of_unittest_dma_ranges_one("/testcase-data/address-tests/pci@90000000",
                0x80000000, 0x20000000, 0x10000000);
 }