From: Michael Ellerman <mpe@ellerman.id.au>
To: Russell King - ARM Linux admin <linux@armlinux.org.uk>,
Christian Zigotzky <chzigotzky@xenosoft.de>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>
Cc: ulf.hansson@linaro.org, "R.T.Dickinson" <rtd2@xtra.co.nz>,
linux-mmc@vger.kernel.org, Rob Herring <robh+dt@kernel.org>,
"contact@a-eon.com" <contact@a-eon.com>,
mad skateman <madskateman@gmail.com>,
linuxppc-dev@lists.ozlabs.org,
Christian Zigotzky <info@xenosoft.de>
Subject: Re: Onboard SD card doesn't work anymore after the 'mmc-v5.4-2' updates
Date: Wed, 23 Oct 2019 16:42:34 +1100 [thread overview]
Message-ID: <87muds586t.fsf@mpe.ellerman.id.au> (raw)
In-Reply-To: <20191015131750.GV25745@shell.armlinux.org.uk>
Russell King - ARM Linux admin <linux@armlinux.org.uk> writes:
> On Tue, Oct 15, 2019 at 03:12:49PM +0200, Christian Zigotzky wrote:
>> Hello Russell,
>>
>> You asked me about "dma-coherent" in the Cyrus device tree. Unfortunately I
>> don't find the property "dma-coherent" in the dtb source files.
>>
>> Output of "fdtdump cyrus_p5020_eth_poweroff.dtb | grep dma":
>>
>> dma0 = "/soc@ffe000000/dma@100300";
>> dma1 = "/soc@ffe000000/dma@101300";
>> dma@100300 {
>> compatible = "fsl,eloplus-dma";
>> dma-channel@0 {
>> compatible = "fsl,eloplus-dma-channel";
>> dma-channel@80 {
>> compatible = "fsl,eloplus-dma-channel";
>> dma-channel@100 {
>> compatible = "fsl,eloplus-dma-channel";
>> dma-channel@180 {
>> compatible = "fsl,eloplus-dma-channel";
>> dma@101300 {
>> compatible = "fsl,eloplus-dma";
>> dma-channel@0 {
>> compatible = "fsl,eloplus-dma-channel";
>> dma-channel@80 {
>> compatible = "fsl,eloplus-dma-channel";
>> dma-channel@100 {
>> compatible = "fsl,eloplus-dma-channel";
>> dma-channel@180 {
>> compatible = "fsl,eloplus-dma-channel";
>
> Hmm, so it looks like PowerPC doesn't mark devices that are dma
> coherent with a property that describes them as such.
>
> I think this opens a wider question - what should of_dma_is_coherent()
> return for PowerPC? It seems right now that it returns false for
> devices that are DMA coherent, which seems to me to be a recipe for
> future mistakes.
Right, it seems of_dma_is_coherent() has baked in the assumption that
devices are non-coherent unless explicitly marked as coherent.
Which is wrong on all or at least most existing powerpc systems
according to Ben.
> Any ideas from the PPC maintainers?
Fixing it at the source seems like the best option to prevent future
breakage.
So I guess that would mean making of_dma_is_coherent() return true/false
based on CONFIG_NOT_COHERENT_CACHE on powerpc.
We could do it like below, which would still allow the dma-coherent
property to work if it ever makes sense on a future powerpc platform.
I don't really know any of this embedded stuff well, so happy to take
other suggestions on how to handle this mess.
cheers
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 25aaa3903000..b96c9010acb6 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -760,6 +760,22 @@ static int __init check_cache_coherency(void)
late_initcall(check_cache_coherency);
#endif /* CONFIG_CHECK_CACHE_COHERENCY */
+#ifndef CONFIG_NOT_COHERENT_CACHE
+/*
+ * For historical reasons powerpc kernels are built with hard wired knowledge of
+ * whether or not DMA accesses are cache coherent. Additionally device trees on
+ * powerpc do not typically support the dma-coherent property.
+ *
+ * So when we know that DMA is coherent, override arch_of_dma_is_coherent() to
+ * tell the drivers/of code that all devices are coherent regardless of whether
+ * they have a dma-coherent property.
+ */
+bool arch_of_dma_is_coherent(struct device_node *np)
+{
+ return true;
+}
+#endif
+
#ifdef CONFIG_DEBUG_FS
struct dentry *powerpc_debugfs_root;
EXPORT_SYMBOL(powerpc_debugfs_root);
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 978427a9d5e6..3a4b2949a322 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -993,6 +993,14 @@ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *siz
}
EXPORT_SYMBOL_GPL(of_dma_get_range);
+/*
+ * arch_of_dma_is_coherent - Arch hook to determine if device is coherent for DMA
+ */
+bool __weak arch_of_dma_is_coherent(struct device_node *np)
+{
+ return false;
+}
+
/**
* of_dma_is_coherent - Check if device is coherent
* @np: device node
@@ -1002,8 +1010,12 @@ EXPORT_SYMBOL_GPL(of_dma_get_range);
*/
bool of_dma_is_coherent(struct device_node *np)
{
- struct device_node *node = of_node_get(np);
+ struct device_node *node;
+
+ if (arch_of_dma_is_coherent(np))
+ return true;
+ np = of_node_get(np);
while (node) {
if (of_property_read_bool(node, "dma-coherent")) {
of_node_put(node);
next parent reply other threads:[~2019-10-23 5:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <7b549219-a2e1-08c7-331b-9c3e4fdb8a8f@xenosoft.de>
[not found] ` <3aeae0d8-e9be-2585-cbbd-70263cb495f1@xenosoft.de>
[not found] ` <20191015125105.GU25745@shell.armlinux.org.uk>
[not found] ` <5611f3bc-68aa-78ec-182a-1cb414202314@xenosoft.de>
[not found] ` <20191015131750.GV25745@shell.armlinux.org.uk>
2019-10-23 5:42 ` Michael Ellerman [this message]
2019-10-23 6:41 ` Onboard SD card doesn't work anymore after the 'mmc-v5.4-2' updates Benjamin Herrenschmidt
2019-10-23 13:52 ` Rob Herring
2019-10-23 14:12 ` Russell King - ARM Linux admin
2019-10-23 14:31 ` Russell King - ARM Linux admin
2019-10-25 22:28 ` Rob Herring
2019-10-26 6:39 ` Christoph Hellwig
2019-10-28 8:47 ` Benjamin Herrenschmidt
2019-10-28 8:45 ` Benjamin Herrenschmidt
2019-10-23 14:20 ` Christian Zigotzky
2019-11-04 14:44 ` Christian Zigotzky
2019-11-05 7:50 ` Bug 205201 - overflow of DMA mask and bus mask Christian Zigotzky
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=87muds586t.fsf@mpe.ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=benh@kernel.crashing.org \
--cc=chzigotzky@xenosoft.de \
--cc=contact@a-eon.com \
--cc=info@xenosoft.de \
--cc=linux-mmc@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=madskateman@gmail.com \
--cc=paulus@samba.org \
--cc=robh+dt@kernel.org \
--cc=rtd2@xtra.co.nz \
--cc=ulf.hansson@linaro.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;
as well as URLs for NNTP newsgroup(s).