of/address: Fix of_pci_range_parser_one translation of DMA addresses

of_pci_range_parser_one() has a bug when parsing dma-ranges. When it
translates the parent address (aka cpu address in the code), 'ranges' is
always being used. This happens to work because most users are just 1:1
translation.

Cc: Robin Murphy <robin.murphy@arm.com>
Tested-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 1c291bd6bce20e0835975124964fa7d76438288a..5ce69d026584b06af401b0fc94e9cf596fb5c5b1 100644 (file)
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -243,6 +243,7 @@ static int parser_init(struct of_pci_range_parser *parser,
        parser->node = node;
        parser->pna = of_n_addr_cells(node);
        parser->np = parser->pna + na + ns;
+       parser->dma = !strcmp(name, "dma-ranges");
 
        parser->range = of_get_property(node, name, &rlen);
        if (parser->range == NULL)
@@ -281,7 +282,11 @@ struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser,
        range->pci_space = be32_to_cpup(parser->range);
        range->flags = of_bus_pci_get_flags(parser->range);
        range->pci_addr = of_read_number(parser->range + 1, ns);
-       range->cpu_addr = of_translate_address(parser->node,
+       if (parser->dma)
+               range->cpu_addr = of_translate_dma_address(parser->node,
+                               parser->range + na);
+       else
+               range->cpu_addr = of_translate_address(parser->node,
                                parser->range + na);
        range->size = of_read_number(parser->range + parser->pna + na, ns);
 
@@ -294,8 +299,12 @@ struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser,
 
                flags = of_bus_pci_get_flags(parser->range);
                pci_addr = of_read_number(parser->range + 1, ns);
-               cpu_addr = of_translate_address(parser->node,
-                               parser->range + na);
+               if (parser->dma)
+                       cpu_addr = of_translate_dma_address(parser->node,
+                                       parser->range + na);
+               else
+                       cpu_addr = of_translate_address(parser->node,
+                                       parser->range + na);
                size = of_read_number(parser->range + parser->pna + na, ns);
 
                if (flags != range->flags)

diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index ddda3936039c48c22a620a3a64d7dc7fe92f1e07..eac7ab109df40892e55d2fdb5a003bbf294b7b87 100644 (file)
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -12,6 +12,7 @@ struct of_pci_range_parser {
        const __be32 *end;
        int np;
        int pna;
+       bool dma;
 };
 
 struct of_pci_range {