From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH v2 07/11] of: populate new device_d::dma_coherent attribute
Date: Wed, 10 Jan 2024 17:01:09 +0100 [thread overview]
Message-ID: <20240110160112.4134162-8-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20240110160112.4134162-1-a.fatoum@pengutronix.de>
So far, whether device DMA is coherent was a one-time global decision.
This is insufficient, because some platforms:
- are cache coherent, while the architecture isn't in general, e.g.
barebox support for ARM with CONFIG_MMU=y assumes non-coherent DMA,
but LS1046A can be fully coherent.
- have a mix of devices that snoop caches and devices that don't
(StarFive JH7100).
To enable dev_dma_(map|unmap)_single to take the correct device-specific
action with regards to cache maintenance, provide dev_is_dma_coherent()
with semantics similar to what Linux provides.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 -> v2:
- make dma_coherent a boolean (Sascha)
- add dma_coherent unconditionally (Sascha)
- Only print dma_coherent status for devices with OF node
---
commands/devinfo.c | 4 ++++
drivers/of/platform.c | 1 +
include/driver.h | 22 ++++++++++++++++++++++
3 files changed, 27 insertions(+)
diff --git a/commands/devinfo.c b/commands/devinfo.c
index aeb9c5533931..6001b00cfac8 100644
--- a/commands/devinfo.c
+++ b/commands/devinfo.c
@@ -105,6 +105,10 @@ static int do_devinfo(int argc, char *argv[])
if (dev->of_node) {
struct device *main_dev = dev->of_node->dev;
+ printf("DMA Coherent: %s%s\n",
+ dev_is_dma_coherent(dev) ? "true" : "false",
+ dev->dma_coherent == DEV_DMA_COHERENCE_DEFAULT ? " (default)" : "");
+
printf("Device node: %pOF", dev->of_node);
if (!main_dev) {
printf(" (unpopulated)\n");
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index edfeb192d434..060fa3458bd2 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -129,6 +129,7 @@ static void of_dma_configure(struct device *dev, struct device_node *np)
}
dev->dma_offset = offset;
+ dev->dma_coherent = of_dma_is_coherent(np);
}
/**
diff --git a/include/driver.h b/include/driver.h
index b37b0ab192a3..c23404ca16fb 100644
--- a/include/driver.h
+++ b/include/driver.h
@@ -25,6 +25,12 @@ struct platform_device_id {
unsigned long driver_data;
};
+enum dev_dma_coherence {
+ DEV_DMA_COHERENCE_DEFAULT = 0,
+ DEV_DMA_COHERENT,
+ DEV_DMA_NON_COHERENT,
+};
+
/** @brief Describes a particular device present in the system */
struct device {
/*! This member (and 'type' described below) is used to match
@@ -45,6 +51,8 @@ struct device {
* something like eth0 or nor0. */
int id;
+ enum dev_dma_coherence dma_coherent;
+
struct resource *resource;
int num_resources;
@@ -720,6 +728,20 @@ static inline struct device_node *dev_of_node(struct device *dev)
return IS_ENABLED(CONFIG_OFDEVICE) ? dev->of_node : NULL;
}
+static inline bool dev_is_dma_coherent(struct device *dev)
+{
+ switch (dev->dma_coherent) {
+ case DEV_DMA_NON_COHERENT:
+ return false;
+ case DEV_DMA_COHERENT:
+ return true;
+ case DEV_DMA_COHERENCE_DEFAULT:
+ break;
+ }
+
+ return IS_ENABLED(CONFIG_ARCH_DMA_DEFAULT_COHERENT);
+}
+
static inline void *dev_get_priv(const struct device *dev)
{
return dev->priv;
--
2.39.2
next prev parent reply other threads:[~2024-01-10 16:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-10 16:01 [PATCH v2 00/11] ARM64: layerscape: make LS1046 DMA coherent Ahmad Fatoum
2024-01-10 16:01 ` [PATCH v2 01/11] dma: rename OF_DMA_DEFAULT_COHERENT to ARCH_DMA_DEFAULT_COHERENT Ahmad Fatoum
2024-01-10 16:01 ` [PATCH v2 02/11] dma: select ARCH_DMA_DEFAULT_COHERENT for x86 and sandbox Ahmad Fatoum
2024-01-10 16:01 ` [PATCH v2 03/11] dma: introduce CONFIG_OF_DMA_COHERENCY Ahmad Fatoum
2024-01-10 16:01 ` [PATCH v2 04/11] RISC-V: StarFive: J7100: set /soc/dma-noncoherent Ahmad Fatoum
2024-01-10 16:01 ` [PATCH v2 05/11] ARM: dts: layerscape: add header for barebox DT overrides Ahmad Fatoum
2024-01-10 16:01 ` [PATCH v2 06/11] ARM: dts: layerscape: mark ls1046a SoC DMA incoherent in DT Ahmad Fatoum
2024-01-10 16:01 ` Ahmad Fatoum [this message]
2024-01-10 16:01 ` [PATCH v2 08/11] dma: fix dma_sync when not all device DMA is equally coherent Ahmad Fatoum
2024-01-10 16:01 ` [PATCH v2 09/11] dma: align barebox DMA coherency setting with kernel's Ahmad Fatoum
2024-01-10 16:01 ` [PATCH v2 10/11] ARM: layerscape: configure all DMA masters to be cache-coherent Ahmad Fatoum
2024-01-10 16:01 ` [PATCH v2 11/11] ARM: layerscape: enable DWC3 snooping on ls1046a Ahmad Fatoum
2024-01-11 14:11 ` [PATCH v2 00/11] ARM64: layerscape: make LS1046 DMA coherent Sascha Hauer
2024-01-11 14:15 ` Ahmad Fatoum
2024-01-11 14:44 ` Sascha Hauer
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=20240110160112.4134162-8-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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