From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: lst@pengutronix.de, Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH RFC 11/12] dma: provide of_dma_coherent_fixup helper
Date: Tue, 21 Feb 2023 09:05:23 +0100 [thread overview]
Message-ID: <20230221080524.607241-12-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20230221080524.607241-1-a.fatoum@pengutronix.de>
Upstream DT changing dma-coherency setting can break booting newer
kernels. TO allows newer bareboxes to both boot old and new kernels add
a new DT fixup helper that may be called from board code after enabling
cache coherence.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
drivers/dma/Makefile | 1 +
drivers/dma/of_fixups.c | 16 ++++++++++++++++
include/of_address.h | 8 ++++++++
3 files changed, 25 insertions(+)
create mode 100644 drivers/dma/of_fixups.c
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index 39829cab5008..a3c1d52e05c3 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_MXS_APBH_DMA) += apbh_dma.o
obj-$(CONFIG_HAS_DMA) += map.o
+obj-$(CONFIG_OFTREE) += of_fixups.o
diff --git a/drivers/dma/of_fixups.c b/drivers/dma/of_fixups.c
new file mode 100644
index 000000000000..27dc24e287ee
--- /dev/null
+++ b/drivers/dma/of_fixups.c
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <of.h>
+#include <of_address.h>
+
+int of_dma_coherent_fixup(struct device_node *root, void *data)
+{
+ struct device_node *soc;
+
+ soc = of_find_node_by_path_from(root, "/soc");
+ if (!soc)
+ return -ENOENT;
+
+ of_property_write_bool(soc, "dma-noncoherent", false);
+ return of_property_write_bool(soc, "dma-coherent", true);
+}
diff --git a/include/of_address.h b/include/of_address.h
index 4e5faf6f7783..4f425e0803eb 100644
--- a/include/of_address.h
+++ b/include/of_address.h
@@ -62,6 +62,8 @@ extern int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr,
extern bool of_dma_is_coherent(struct device_node *np);
+extern int of_dma_coherent_fixup(struct device_node *np, void *unused);
+
#else /* CONFIG_OFTREE */
static inline u64 of_translate_address(struct device_node *dev,
@@ -115,6 +117,12 @@ static inline bool of_dma_is_coherent(struct device_node *np)
{
return false;
}
+
+static inline int of_dma_coherent_fixup(struct device_node *np, void *unused)
+{
+ return 0;
+}
+
#endif /* CONFIG_OFTREE */
#ifdef CONFIG_OF_PCI
--
2.30.2
next prev parent reply other threads:[~2023-02-21 8:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-21 8:05 [PATCH RFC 00/12] ARM64: layerscape: make LS1046 DMA coherent Ahmad Fatoum
2023-02-21 8:05 ` [PATCH RFC 01/12] usb: dwc3: populate parent of xHCI dev Ahmad Fatoum
2023-02-21 8:05 ` [PATCH RFC 02/12] usb: xhci: pass physical device to DMA API Ahmad Fatoum
2023-02-21 8:05 ` [PATCH RFC 03/12] net: rtl8169: pass physical device for " Ahmad Fatoum
2023-02-21 8:05 ` [PATCH RFC 04/12] firmware: zynqmp-fpga: pass physical device to " Ahmad Fatoum
2023-02-21 8:05 ` [PATCH RFC 05/12] net: designware: eqos: " Ahmad Fatoum
2023-02-21 8:05 ` [PATCH RFC 06/12] x86: select OF_DMA_DEFAULT_COHERENT Ahmad Fatoum
2023-02-21 8:05 ` [PATCH RFC 07/12] dma: define CONFIG_OF_DMA_COHERENCY Ahmad Fatoum
2023-02-21 8:05 ` [PATCH RFC 08/12] RISC-V: StarFive: J7100: set /soc/dma-noncoherent Ahmad Fatoum
2023-02-21 8:05 ` [PATCH RFC 09/12] of: populate new device_d::dma_coherent attribute Ahmad Fatoum
2023-02-27 10:41 ` Sascha Hauer
2024-01-11 7:05 ` Ahmad Fatoum
2023-02-21 8:05 ` [PATCH RFC 10/12] dma: fix dma_sync when not all device DMA is equally coherent Ahmad Fatoum
2023-02-21 8:05 ` Ahmad Fatoum [this message]
2023-02-21 8:05 ` [PATCH RFC 12/12] ARM64: layerscape: configure all DMA masters to be cache-coherent Ahmad Fatoum
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=20230221080524.607241-12-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=lst@pengutronix.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox