From: Robin Murphy <robin.murphy@arm.com>
Date: Wed, 3 Jul 2019 13:47:31 +0000 (+0100)
Subject: of: address: Follow DMA parent for "dma-coherent"
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c60bf3eb888a362100aa1bdbea351dab681e262a;p=linux.git

of: address: Follow DMA parent for "dma-coherent"

Much like for address translation, when checking for DMA coherence we
should be sure to walk up the DMA hierarchy, rather than the MMIO one,
now that we can accommodate them being different.

Signed-off-by: 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 e9188c82fdae7..3fd34f7ad7721 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -999,7 +999,7 @@ bool of_dma_is_coherent(struct device_node *np)
 			of_node_put(node);
 			return true;
 		}
-		node = of_get_next_parent(node);
+		node = of_get_next_dma_parent(node);
 	}
 	of_node_put(node);
 	return false;