dma-mapping: allow using the global coherent pool for !ARM

Christoph Hellwig · Christoph Hellwig · commit 70d6aa0ecfed · 2021-08-18T16:24:10.000+02:00
Switch an ifdef so that the global coherent pool is initialized for
any architecture that selects the DMA_GLOBAL_POOL symbol insted of
hardcoding ARM.

Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
Tested-by: Dillon Min &lt;dillon.minfei@gmail.com&gt;
diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c
@@ -361,7 +361,9 @@ static int __init rmem_dma_setup(struct reserved_mem *rmem)
 		pr_err("Reserved memory: regions without no-map are not yet supported\n");
 		return -EINVAL;
 	}
+#endif
 
+#ifdef CONFIG_DMA_GLOBAL_POOL
 	if (of_get_flat_dt_prop(node, "linux,dma-default", NULL)) {
 		WARN(dma_reserved_default_memory,
 		     "Reserved memory: region for default DMA coherent area is redefined\n");

Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,9 @@ static int __init rmem_dma_setup(struct reserved_mem *rmem)`
`361`	`361`	`pr_err("Reserved memory: regions without no-map are not yet supported\n");`
`362`	`362`	`return -EINVAL;`
`363`	`363`	`}`
	`364`	`+#endif`
`364`	`365`
	`366`	`+#ifdef CONFIG_DMA_GLOBAL_POOL`
`365`	`367`	`if (of_get_flat_dt_prop(node, "linux,dma-default", NULL)) {`
`366`	`368`	`WARN(dma_reserved_default_memory,`
`367`	`369`	`"Reserved memory: region for default DMA coherent area is redefined\n");`