All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jiaxun Yang <jiaxun.yang@flygoat.com>
To: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	tsbogend@alpha.franken.de, mpe@ellerman.id.au,
	paul.walmsley@sifive.com, palmer@dabbelt.com, robh+dt@kernel.org,
	hch@lst.de, m.szyprowski@samsung.com, robin.murphy@arm.com,
	linux-riscv@lists.infradead.org,
	Jiaxun Yang <jiaxun.yang@flygoat.com>
Subject: [PATCH v3 2/4] dma-mapping: Provide a fallback dma_default_coherent
Date: Tue, 21 Mar 2023 11:08:11 +0000	[thread overview]
Message-ID: <20230321110813.26808-3-jiaxun.yang@flygoat.com> (raw)
In-Reply-To: <20230321110813.26808-1-jiaxun.yang@flygoat.com>

dma_default_coherent was decleared unconditionally at kernel/dma/mapping.c
but only decleared when any of non-coherent options is enabled in
dma-map-ops.h.

Guard the declaration in mapping.c with non-coherent options and provide
a fallback definition.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
v3: Style fix
---
 include/linux/dma-map-ops.h | 2 ++
 kernel/dma/mapping.c        | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h
index 41bf4bdb117a..31f114f486c4 100644
--- a/include/linux/dma-map-ops.h
+++ b/include/linux/dma-map-ops.h
@@ -269,6 +269,8 @@ static inline bool dev_is_dma_coherent(struct device *dev)
 	return dev->dma_coherent;
 }
 #else
+#define dma_default_coherent true
+
 static inline bool dev_is_dma_coherent(struct device *dev)
 {
 	return true;
diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index 68106e3791f6..80f9663ffe26 100644
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -17,7 +17,11 @@
 #include "debug.h"
 #include "direct.h"
 
+#if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE) || \
+	defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU) || \
+	defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL)
 bool dma_default_coherent;
+#endif
 
 /*
  * Managed DMA API
-- 
2.37.1 (Apple Git-137.1)


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

WARNING: multiple messages have this Message-ID (diff)
From: Jiaxun Yang <jiaxun.yang@flygoat.com>
To: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	tsbogend@alpha.franken.de, mpe@ellerman.id.au,
	paul.walmsley@sifive.com, palmer@dabbelt.com, robh+dt@kernel.org,
	hch@lst.de, m.szyprowski@samsung.com, robin.murphy@arm.com,
	linux-riscv@lists.infradead.org,
	Jiaxun Yang <jiaxun.yang@flygoat.com>
Subject: [PATCH v3 2/4] dma-mapping: Provide a fallback dma_default_coherent
Date: Tue, 21 Mar 2023 11:08:11 +0000	[thread overview]
Message-ID: <20230321110813.26808-3-jiaxun.yang@flygoat.com> (raw)
In-Reply-To: <20230321110813.26808-1-jiaxun.yang@flygoat.com>

dma_default_coherent was decleared unconditionally at kernel/dma/mapping.c
but only decleared when any of non-coherent options is enabled in
dma-map-ops.h.

Guard the declaration in mapping.c with non-coherent options and provide
a fallback definition.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
v3: Style fix
---
 include/linux/dma-map-ops.h | 2 ++
 kernel/dma/mapping.c        | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h
index 41bf4bdb117a..31f114f486c4 100644
--- a/include/linux/dma-map-ops.h
+++ b/include/linux/dma-map-ops.h
@@ -269,6 +269,8 @@ static inline bool dev_is_dma_coherent(struct device *dev)
 	return dev->dma_coherent;
 }
 #else
+#define dma_default_coherent true
+
 static inline bool dev_is_dma_coherent(struct device *dev)
 {
 	return true;
diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index 68106e3791f6..80f9663ffe26 100644
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -17,7 +17,11 @@
 #include "debug.h"
 #include "direct.h"
 
+#if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE) || \
+	defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU) || \
+	defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL)
 bool dma_default_coherent;
+#endif
 
 /*
  * Managed DMA API
-- 
2.37.1 (Apple Git-137.1)


WARNING: multiple messages have this Message-ID (diff)
From: Jiaxun Yang <jiaxun.yang@flygoat.com>
To: linux-mips@vger.kernel.org
Cc: tsbogend@alpha.franken.de, linux-kernel@vger.kernel.org,
	Jiaxun Yang <jiaxun.yang@flygoat.com>,
	robh+dt@kernel.org, palmer@dabbelt.com, paul.walmsley@sifive.com,
	robin.murphy@arm.com, linux-riscv@lists.infradead.org,
	linuxppc-dev@lists.ozlabs.org, hch@lst.de,
	m.szyprowski@samsung.com
Subject: [PATCH v3 2/4] dma-mapping: Provide a fallback dma_default_coherent
Date: Tue, 21 Mar 2023 11:08:11 +0000	[thread overview]
Message-ID: <20230321110813.26808-3-jiaxun.yang@flygoat.com> (raw)
In-Reply-To: <20230321110813.26808-1-jiaxun.yang@flygoat.com>

dma_default_coherent was decleared unconditionally at kernel/dma/mapping.c
but only decleared when any of non-coherent options is enabled in
dma-map-ops.h.

Guard the declaration in mapping.c with non-coherent options and provide
a fallback definition.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
v3: Style fix
---
 include/linux/dma-map-ops.h | 2 ++
 kernel/dma/mapping.c        | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h
index 41bf4bdb117a..31f114f486c4 100644
--- a/include/linux/dma-map-ops.h
+++ b/include/linux/dma-map-ops.h
@@ -269,6 +269,8 @@ static inline bool dev_is_dma_coherent(struct device *dev)
 	return dev->dma_coherent;
 }
 #else
+#define dma_default_coherent true
+
 static inline bool dev_is_dma_coherent(struct device *dev)
 {
 	return true;
diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index 68106e3791f6..80f9663ffe26 100644
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -17,7 +17,11 @@
 #include "debug.h"
 #include "direct.h"
 
+#if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE) || \
+	defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU) || \
+	defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL)
 bool dma_default_coherent;
+#endif
 
 /*
  * Managed DMA API
-- 
2.37.1 (Apple Git-137.1)


  parent reply	other threads:[~2023-03-21 11:08 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-21 11:08 [PATCH v3 0/4] Use dma_default_coherent for devicetree default coherency Jiaxun Yang
2023-03-21 11:08 ` Jiaxun Yang
2023-03-21 11:08 ` Jiaxun Yang
2023-03-21 11:08 ` [PATCH v3 1/4] of: address: Fix default coherency for MIPS Jiaxun Yang
2023-03-21 11:08   ` Jiaxun Yang
2023-03-21 11:08   ` Jiaxun Yang
2023-03-28 14:15   ` Rob Herring
2023-03-28 14:15     ` Rob Herring
2023-03-28 14:15     ` Rob Herring
2023-03-21 11:08 ` Jiaxun Yang [this message]
2023-03-21 11:08   ` [PATCH v3 2/4] dma-mapping: Provide a fallback dma_default_coherent Jiaxun Yang
2023-03-21 11:08   ` Jiaxun Yang
2023-03-21 11:08 ` [PATCH v3 3/4] dma-mapping: Provide CONFIG_ARCH_DMA_DEFAULT_COHERENT Jiaxun Yang
2023-03-21 11:08   ` Jiaxun Yang
2023-03-21 11:08   ` Jiaxun Yang
2023-03-21 11:08 ` [PATCH v3 4/4] of: address: Always use dma_default_coherent for default coherency Jiaxun Yang
2023-03-21 11:08   ` Jiaxun Yang
2023-03-21 11:08   ` Jiaxun Yang
2023-03-28 14:17   ` Rob Herring
2023-03-28 14:17     ` Rob Herring
2023-03-28 14:17     ` Rob Herring
2023-03-29  3:27   ` Michael Ellerman
2023-03-29  3:27     ` Michael Ellerman
2023-03-29  3:27     ` Michael Ellerman
2023-03-23  7:29 ` [PATCH v3 0/4] Use dma_default_coherent for devicetree " Christoph Hellwig
2023-03-23  7:29   ` Christoph Hellwig
2023-03-23  7:29   ` Christoph Hellwig
2023-03-23 21:07   ` Jiaxun Yang
2023-03-23 21:07     ` Jiaxun Yang
2023-03-23 21:07     ` Jiaxun Yang
2023-03-23 21:39     ` Christoph Hellwig
2023-03-23 21:39       ` Christoph Hellwig
2023-03-23 21:39       ` Christoph Hellwig
2023-03-24  9:17       ` Jiaxun Yang
2023-03-24  9:17         ` Jiaxun Yang
2023-03-24  9:17         ` Jiaxun Yang
2023-03-28  1:18         ` Christoph Hellwig
2023-03-28  1:18           ` Christoph Hellwig
2023-03-28  1:18           ` Christoph Hellwig
2023-03-28  7:45           ` Thomas Bogendoerfer
2023-03-28  7:45             ` Thomas Bogendoerfer
2023-03-28  7:45             ` Thomas Bogendoerfer
2023-03-28 13:02             ` Jiaxun Yang
2023-03-28 13:02               ` Jiaxun Yang
2023-03-28 13:02               ` Jiaxun Yang

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=20230321110813.26808-3-jiaxun.yang@flygoat.com \
    --to=jiaxun.yang@flygoat.com \
    --cc=hch@lst.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=m.szyprowski@samsung.com \
    --cc=mpe@ellerman.id.au \
    --cc=palmer@dabbelt.com \
    --cc=paul.walmsley@sifive.com \
    --cc=robh+dt@kernel.org \
    --cc=robin.murphy@arm.com \
    --cc=tsbogend@alpha.franken.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.