mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Huacai Chen <chenhc@lemote.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>,
	Robin Murphy <robin.murphy@arm.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Fuxin Zhang <zhangfx@lemote.com>,
	linux-kernel@vger.kernel.org, Huacai Chen <chenhc@lemote.com>,
	stable@vger.kernel.org
Subject: [PATCH V4 1/3] dma-mapping: Provide a default plat_device_is_coherent()
Date: Fri, 15 Sep 2017 10:58:22 +0800	[thread overview]
Message-ID: <1505444302-17036-1-git-send-email-chenhc@lemote.com> (raw)

We will use plat_device_is_coherent() in generic cases, but it is
MIPS-specific now. So we provide a default implementation.

BTW, export the symbol hw_coherentio for MIPS if the caller of
plat_device_is_coherent() is in a module.

Cc: stable@vger.kernel.org
Signed-off-by: Huacai Chen <chenhc@lemote.com>
---
 arch/mips/include/asm/dma-mapping.h | 1 +
 arch/mips/mm/dma-default.c          | 1 +
 include/linux/dma-mapping.h         | 8 ++++++++
 3 files changed, 10 insertions(+)

diff --git a/arch/mips/include/asm/dma-mapping.h b/arch/mips/include/asm/dma-mapping.h
index aba7138..662eca9 100644
--- a/arch/mips/include/asm/dma-mapping.h
+++ b/arch/mips/include/asm/dma-mapping.h
@@ -8,6 +8,7 @@
 #ifndef CONFIG_SGI_IP27 /* Kludge to fix 2.6.39 build for IP27 */
 #include <dma-coherence.h>
 #endif
+#define ARCH_HAS_PLAT_DEVICE_IS_COHERENT
 
 extern const struct dma_map_ops *mips_dma_map_ops;
 
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index 8e78251..b4c74ab 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -29,6 +29,7 @@
 enum coherent_io_user_state coherentio = IO_COHERENCE_DEFAULT;
 EXPORT_SYMBOL_GPL(coherentio);
 int hw_coherentio = 0;	/* Actual hardware supported DMA coherency setting. */
+EXPORT_SYMBOL_GPL(hw_coherentio);
 
 static int __init setcoherentio(char *str)
 {
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 29ce981..6517388 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -697,6 +697,14 @@ static inline void *dma_zalloc_coherent(struct device *dev, size_t size,
 }
 
 #ifdef CONFIG_HAS_DMA
+
+#ifndef ARCH_HAS_PLAT_DEVICE_IS_COHERENT
+static inline int plat_device_is_coherent(struct device *dev)
+{
+	return 1;
+}
+#endif
+
 static inline int dma_get_cache_alignment(void)
 {
 #ifdef ARCH_DMA_MINALIGN
-- 
2.7.0

             reply	other threads:[~2017-09-15  2:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-15  2:58 Huacai Chen [this message]
2017-09-15 15:17 ` 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=1505444302-17036-1-git-send-email-chenhc@lemote.com \
    --to=chenhc@lemote.com \
    --cc=akpm@linux-foundation.org \
    --cc=hch@lst.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=robin.murphy@arm.com \
    --cc=stable@vger.kernel.org \
    --cc=zhangfx@lemote.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®