of/unittest: Add empty dma-ranges address translation tests

Intermediate DT PCI nodes dynamically generated by enabling
CONFIG_PCI_DYNAMIC_OF_NODES have empty dma-ranges property. PCI address
specifiers have 3 cells and when dma-ranges is missing or empty,
of_translate_one() is currently dropping the flag portion of PCI addresses
which are subnodes of the aforementioned ones, failing the translation.
Add new tests covering this case.

With this test, we get 1 new failure which is fixed in subsequent
commit:

FAIL of_unittest_pci_empty_dma_ranges():1245 for_each_of_pci_range wrong CPU addr (ffffffffffffffff) on node /testcase-data/address-tests2/pcie@d1070000/pci@0,0/dev@0,0/local-bus@0

Signed-off-by: Andrea della Porta <andrea.porta@suse.com>
Link: https://lore.kernel.org/r/08f8fee4fdc0379240fda2f4a0e6f11ebf9647a8.1732441813.git.andrea.porta@suse.com
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>

diff --git a/drivers/of/unittest-data/tests-address.dtsi b/drivers/of/unittest-data/tests-address.dtsi
index 3344f15c3755cdc9aaa014b8c98359e50765d9fd..f02a181bb125936786f55b2892a16aacf25a363d 100644 (file)
--- a/drivers/of/unittest-data/tests-address.dtsi
+++ b/drivers/of/unittest-data/tests-address.dtsi
@@ -114,6 +114,7 @@
                                device_type = "pci";
                                ranges = <0x82000000 0 0xe8000000 0 0xe8000000 0 0x7f00000>,
                                         <0x81000000 0 0x00000000 0 0xefff0000 0 0x0010000>;
+                               dma-ranges = <0x43000000 0x10 0x00 0x00 0x00 0x00 0x10000000>;
                                reg = <0x00000000 0xd1070000 0x20000>;
 
                                pci@0,0 {
@@ -142,6 +143,7 @@
                                                        #size-cells = <0x01>;
                                                        ranges = <0xa0000000 0 0 0 0x2000000>,
                                                                 <0xb0000000 1 0 0 0x1000000>;
+                                                       dma-ranges = <0xc0000000 0x43000000 0x10 0x00 0x10000000>;
 
                                                        dev@e0000000 {
                                                                reg = <0xa0001000 0x1000>,

diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index daf9a2dddd7e0dbc680f708496b6dce6d23999cf..80483e38d7b4d2388cf8dfa004fe94a79fc1dca8 100644 (file)
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -1213,6 +1213,44 @@ static void __init of_unittest_pci_dma_ranges(void)
        of_node_put(np);
 }
 
+static void __init of_unittest_pci_empty_dma_ranges(void)
+{
+       struct device_node *np;
+       struct of_pci_range range;
+       struct of_pci_range_parser parser;
+
+       if (!IS_ENABLED(CONFIG_PCI))
+               return;
+
+       np = of_find_node_by_path("/testcase-data/address-tests2/pcie@d1070000/pci@0,0/dev@0,0/local-bus@0");
+       if (!np) {
+               pr_err("missing testcase data\n");
+               return;
+       }
+
+       if (of_pci_dma_range_parser_init(&parser, np)) {
+               pr_err("missing dma-ranges property\n");
+               return;
+       }
+
+       /*
+        * Get the dma-ranges from the device tree
+        */
+       for_each_of_pci_range(&parser, &range) {
+               unittest(range.size == 0x10000000,
+                        "for_each_of_pci_range wrong size on node %pOF size=%llx\n",
+                        np, range.size);
+               unittest(range.cpu_addr == 0x00000000,
+                        "for_each_of_pci_range wrong CPU addr (%llx) on node %pOF",
+                        range.cpu_addr, np);
+               unittest(range.pci_addr == 0xc0000000,
+                        "for_each_of_pci_range wrong DMA addr (%llx) on node %pOF",
+                        range.pci_addr, np);
+       }
+
+       of_node_put(np);
+}
+
 static void __init of_unittest_bus_ranges(void)
 {
        struct device_node *np;
@@ -4272,6 +4310,7 @@ static int __init of_unittest(void)
        of_unittest_dma_get_max_cpu_address();
        of_unittest_parse_dma_ranges();
        of_unittest_pci_dma_ranges();
+       of_unittest_pci_empty_dma_ranges();
        of_unittest_bus_ranges();
        of_unittest_bus_3cell_ranges();
        of_unittest_reg();