linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/1] dma: coherent: check no-map property for arm64
@ 2021-06-11 13:10 Dong Aisheng
  2021-06-14  8:36 ` Will Deacon
  0 siblings, 1 reply; 7+ messages in thread
From: Dong Aisheng @ 2021-06-11 13:10 UTC (permalink / raw)
  To: iommu
  Cc: linux-kernel, linux-mm, dongas86, linux-arm-kernel, Dong Aisheng,
	Christoph Hellwig, Marek Szyprowski, Robin Murphy

Coherent dma on ARM64 also can't work with mapped system ram,
that means 'no-map' property must be specified in dts.
Add the missing check for ARM64 platforms as well.
Besides 'no-map' checking, 'linux,dma-default' feature is also
enabled for ARM64 along with this patch.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
 kernel/dma/coherent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c
index 5b5b6c7ec7f2..d1831da7afba 100644
--- a/kernel/dma/coherent.c
+++ b/kernel/dma/coherent.c
@@ -356,7 +356,7 @@ static int __init rmem_dma_setup(struct reserved_mem *rmem)
 	if (of_get_flat_dt_prop(node, "reusable", NULL))
 		return -EINVAL;
 
-#ifdef CONFIG_ARM
+#if defined(CONFIG_ARM) || defined(CONFIG_ARM64)
 	if (!of_get_flat_dt_prop(node, "no-map", NULL)) {
 		pr_err("Reserved memory: regions without no-map are not yet supported\n");
 		return -EINVAL;
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2021-06-15  7:20 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-11 13:10 [PATCH 1/1] dma: coherent: check no-map property for arm64 Dong Aisheng
2021-06-14  8:36 ` Will Deacon
2021-06-14 10:07   ` Dong Aisheng
2021-06-14 14:51     ` Catalin Marinas
2021-06-14 15:34       ` Robin Murphy
2021-06-14 15:36         ` Christoph Hellwig
2021-06-15  7:19           ` Marek Szyprowski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).