31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
From e4a649779ff6857240fe691cdf147a3b4896e71b Mon Sep 17 00:00:00 2001
|
|
From: Robin Murphy <robin.murphy@arm.com>
|
|
Date: Wed, 3 Jul 2019 14:47:31 +0100
|
|
Subject: [PATCH] of: address: Follow DMA parent for "dma-coherent"
|
|
|
|
commit c60bf3eb888a362100aa1bdbea351dab681e262a upstream.
|
|
|
|
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>
|
|
---
|
|
drivers/of/address.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/of/address.c
|
|
+++ b/drivers/of/address.c
|
|
@@ -1025,7 +1025,7 @@ bool of_dma_is_coherent(struct device_no
|
|
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;
|