LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: iommu@lists.linux-foundation.org,
	Russell King <linux@armlinux.org.uk>,
	Brian Cain <bcain@codeaurora.org>
Cc: Dillon Min <dillon.minfei@gmail.com>,
	Vladimir Murzin <vladimir.murzin@arm.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-hexagon@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/7] dma-mapping: allow using the global coherent pool for !ARM
Date: Mon, 12 Jul 2021 08:17:00 +0200	[thread overview]
Message-ID: <20210712061704.4162464-4-hch@lst.de> (raw)
In-Reply-To: <20210712061704.4162464-1-hch@lst.de>

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 <hch@lst.de>
Tested-by: Dillon Min <dillon.minfei@gmail.com>
---
 kernel/dma/coherent.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c
index 794e76b03b34..67b126afac5a 100644
--- 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");
-- 
2.30.2


  parent reply	other threads:[~2021-07-12  6:32 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-12  6:16 add support for the global coherent pool to the dma core Christoph Hellwig
2021-07-12  6:16 ` [PATCH 1/7] dma-direct: add support for dma_coherent_default_memory Christoph Hellwig
2021-07-12  6:16 ` [PATCH 2/7] ARM/nommu: use the generic dma-direct code for non-coherent devices Christoph Hellwig
2021-07-12  6:17 ` Christoph Hellwig [this message]
2021-07-12  6:17 ` [PATCH 4/7] dma-mapping: simplify dma_init_coherent_memory Christoph Hellwig
2021-07-12  6:17 ` [PATCH 5/7] dma-mapping: add a dma_init_global_coherent helper Christoph Hellwig
2021-07-12  6:17 ` [PATCH 6/7] dma-mapping: make the global coherent pool conditional Christoph Hellwig
2021-07-23 21:41   ` Atish Patra
2021-07-12  6:17 ` [PATCH 7/7] hexagon: use the generic global coherent pool Christoph Hellwig
2021-08-14  1:57   ` Brian Cain
2021-08-18 14:27     ` 'Christoph Hellwig'
2021-07-28 15:20 ` add support for the global coherent pool to the dma core Brian Cain
2021-08-12 13:09   ` 'Christoph Hellwig'
2021-08-14  7:03 ` Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210712061704.4162464-4-hch@lst.de \
    --to=hch@lst.de \
    --cc=bcain@codeaurora.org \
    --cc=dillon.minfei@gmail.com \
    --cc=iommu@lists.linux-foundation.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-hexagon@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=vladimir.murzin@arm.com \
    --subject='Re: [PATCH 3/7] dma-mapping: allow using the global coherent pool for '\!'ARM' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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).