Re: [FSL P5020 P5040 PPC] Onboard SD card doesn't work anymore after the 'mmc-v5.4-2' updates
Christian Zigotzky writes: > On 24 January 2020 at 12:42 pm, Michael Ellerman wrote: >> Ulf Hansson writes: >>> On Thu, 16 Jan 2020 at 12:18, Christian Zigotzky >>> wrote: Hi All, We still need the attached patch for our onboard SD card interface [1,2]. Could you please add this patch to the tree? >>> No, because according to previous discussion that isn't the correct >>> solution and more importantly it will break other archs (if I recall >>> correctly). >>> >>> Looks like someone from the ppc community needs to pick up the ball. >> That's a pretty small community these days :) :/ >> >> Christian can you test this please? I think I got the polarity of all >> the tests right, but it's Friday night so maybe I'm wrong :) >> >> cheers > Michael, > > Thanks a lot for the new patch! I compiled the RC7 of kernel 5.5 with > your patch again yesterday and the kernel works without any problems > with our onboard SD cards. [1] Thanks for testing. cheers
Re: [FSL P5020 P5040 PPC] Onboard SD card doesn't work anymore after the 'mmc-v5.4-2' updates
On 24 January 2020 at 12:42 pm, Michael Ellerman wrote:
Ulf Hansson writes:
On Thu, 16 Jan 2020 at 12:18, Christian Zigotzky wrote:
Hi All,
We still need the attached patch for our onboard SD card interface
[1,2]. Could you please add this patch to the tree?
No, because according to previous discussion that isn't the correct
solution and more importantly it will break other archs (if I recall
correctly).
Looks like someone from the ppc community needs to pick up the ball.
That's a pretty small community these days :) :/
Christian can you test this please? I think I got the polarity of all
the tests right, but it's Friday night so maybe I'm wrong :)
cheers
Michael,
Thanks a lot for the new patch! I compiled the RC7 of kernel 5.5 with
your patch again yesterday and the kernel works without any problems
with our onboard SD cards. [1]
Cheers,
Christian
[1]
http://forum.hyperion-entertainment.com/viewtopic.php?f=58&t=4384&p=49697#p49693
>From 975ba6e8b52d6f5358e93c1f5a47adc4a0b5fb70 Mon Sep 17 00:00:00 2001
From: Michael Ellerman
Date: Fri, 24 Jan 2020 22:26:59 +1100
Subject: [PATCH] of: Add OF_DMA_DEFAULT_COHERENT & select it on powerpc
There's an OF helper called of_dma_is_coherent(), which checks if a
device has a "dma-coherent" property to see if the device is coherent
for DMA.
But on some platforms devices are coherent by default, and on some
platforms it's not possible to update existing device trees to add the
"dma-coherent" property.
So add a Kconfig symbol to allow arch code to tell
of_dma_is_coherent() that devices are coherent by default, regardless
of the presence of the property.
Select that symbol on powerpc when NOT_COHERENT_CACHE is not set, ie.
when the system has a coherent cache.
Fixes: 92ea637edea3 ("of: introduce of_dma_is_coherent() helper")
Cc: sta...@vger.kernel.org # v3.16+
Signed-off-by: Michael Ellerman
---
arch/powerpc/Kconfig | 1 +
drivers/of/Kconfig | 4
drivers/of/address.c | 6 +-
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 62752c3bfabf..460678ab2375 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -235,6 +235,7 @@ config PPC
select NEED_DMA_MAP_STATE if PPC64 || NOT_COHERENT_CACHE
select NEED_SG_DMA_LENGTH
select OF
+ select OF_DMA_DEFAULT_COHERENT if !NOT_COHERENT_CACHE
select OF_EARLY_FLATTREE
select OLD_SIGACTIONif PPC32
select OLD_SIGSUSPEND
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 37c2ccbefecd..d91618641be6 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -103,4 +103,8 @@ config OF_OVERLAY
config OF_NUMA
bool
+config OF_DMA_DEFAULT_COHERENT
+ # arches should select this if DMA is coherent by default for OF devices
+ bool
+
endif # OF
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 99c1b8058559..e8a39c3ec4d4 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -995,12 +995,16 @@ int of_dma_get_range(struct device_node *np, u64
*dma_addr, u64 *paddr, u64 *siz
* @np: device node
*
* It returns true if "dma-coherent" property was found
- * for this device in DT.
+ * for this device in the DT, or if DMA is coherent by
+ * default for OF devices on the current platform.
*/
bool of_dma_is_coherent(struct device_node *np)
{
struct device_node *node = of_node_get(np);
+ if (IS_ENABLED(CONFIG_OF_DMA_DEFAULT_COHERENT))
+ return true;
+
while (node) {
if (of_property_read_bool(node, "dma-coherent")) {
of_node_put(node);
Re: [FSL P5020 P5040 PPC] Onboard SD card doesn't work anymore after the 'mmc-v5.4-2' updates
Ulf Hansson writes:
> On Thu, 16 Jan 2020 at 12:18, Christian Zigotzky
> wrote:
>>
>> Hi All,
>>
>> We still need the attached patch for our onboard SD card interface
>> [1,2]. Could you please add this patch to the tree?
>
> No, because according to previous discussion that isn't the correct
> solution and more importantly it will break other archs (if I recall
> correctly).
>
> Looks like someone from the ppc community needs to pick up the ball.
That's a pretty small community these days :) :/
Christian can you test this please? I think I got the polarity of all
the tests right, but it's Friday night so maybe I'm wrong :)
cheers
>From 975ba6e8b52d6f5358e93c1f5a47adc4a0b5fb70 Mon Sep 17 00:00:00 2001
From: Michael Ellerman
Date: Fri, 24 Jan 2020 22:26:59 +1100
Subject: [PATCH] of: Add OF_DMA_DEFAULT_COHERENT & select it on powerpc
There's an OF helper called of_dma_is_coherent(), which checks if a
device has a "dma-coherent" property to see if the device is coherent
for DMA.
But on some platforms devices are coherent by default, and on some
platforms it's not possible to update existing device trees to add the
"dma-coherent" property.
So add a Kconfig symbol to allow arch code to tell
of_dma_is_coherent() that devices are coherent by default, regardless
of the presence of the property.
Select that symbol on powerpc when NOT_COHERENT_CACHE is not set, ie.
when the system has a coherent cache.
Fixes: 92ea637edea3 ("of: introduce of_dma_is_coherent() helper")
Cc: sta...@vger.kernel.org # v3.16+
Signed-off-by: Michael Ellerman
---
arch/powerpc/Kconfig | 1 +
drivers/of/Kconfig | 4
drivers/of/address.c | 6 +-
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 62752c3bfabf..460678ab2375 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -235,6 +235,7 @@ config PPC
select NEED_DMA_MAP_STATE if PPC64 || NOT_COHERENT_CACHE
select NEED_SG_DMA_LENGTH
select OF
+ select OF_DMA_DEFAULT_COHERENT if !NOT_COHERENT_CACHE
select OF_EARLY_FLATTREE
select OLD_SIGACTIONif PPC32
select OLD_SIGSUSPEND
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 37c2ccbefecd..d91618641be6 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -103,4 +103,8 @@ config OF_OVERLAY
config OF_NUMA
bool
+config OF_DMA_DEFAULT_COHERENT
+ # arches should select this if DMA is coherent by default for OF devices
+ bool
+
endif # OF
diff --git a/drivers/of/address.c b/drivers/of/address.c
index 99c1b8058559..e8a39c3ec4d4 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -995,12 +995,16 @@ int of_dma_get_range(struct device_node *np, u64
*dma_addr, u64 *paddr, u64 *siz
* @np:device node
*
* It returns true if "dma-coherent" property was found
- * for this device in DT.
+ * for this device in the DT, or if DMA is coherent by
+ * default for OF devices on the current platform.
*/
bool of_dma_is_coherent(struct device_node *np)
{
struct device_node *node = of_node_get(np);
+ if (IS_ENABLED(CONFIG_OF_DMA_DEFAULT_COHERENT))
+ return true;
+
while (node) {
if (of_property_read_bool(node, "dma-coherent")) {
of_node_put(node);
--
2.21.1
Re: [FSL P5020 P5040 PPC] Onboard SD card doesn't work anymore after the 'mmc-v5.4-2' updates
On Mon, 20 Jan 2020 at 10:17, Christian Zigotzky wrote: > > Am 16.01.20 um 16:46 schrieb Ulf Hansson: > > On Thu, 16 Jan 2020 at 12:18, Christian Zigotzky > > wrote: > >> Hi All, > >> > >> We still need the attached patch for our onboard SD card interface > >> [1,2]. Could you please add this patch to the tree? > > No, because according to previous discussion that isn't the correct > > solution and more importantly it will break other archs (if I recall > > correctly). > > > > Looks like someone from the ppc community needs to pick up the ball. > I am not sure if the ppc community have to fix this issue because your > updates (mmc-v5.4-2) are responsible for this issue. If nobody wants to > fix this issue then we will lost the onboard SD card support in the > future. PLEASE check the 'mmc-v5.4-2' updates again. Applying your suggested fix breaks other archs/boards. It's really not a good situation, but I will not take a step back when it's quite easy to take a step forward instead. Someone just need to care and send a patch, it doesn't look that hard to me, but maybe I am wrong. Apologies if this isn't the answer you wanted, but that's all I can do for now, sorry. Kind regards Uffe
[FSL P5020 P5040 PPC] Onboard SD card doesn't work anymore after the 'mmc-v5.4-2' updates
Am 16.01.20 um 16:46 schrieb Ulf Hansson: On Thu, 16 Jan 2020 at 12:18, Christian Zigotzky wrote: Hi All, We still need the attached patch for our onboard SD card interface [1,2]. Could you please add this patch to the tree? No, because according to previous discussion that isn't the correct solution and more importantly it will break other archs (if I recall correctly). Looks like someone from the ppc community needs to pick up the ball. I am not sure if the ppc community have to fix this issue because your updates (mmc-v5.4-2) are responsible for this issue. If nobody wants to fix this issue then we will lost the onboard SD card support in the future. PLEASE check the 'mmc-v5.4-2' updates again. Thanks, Christian [1] https://www.spinics.net/lists/linux-mmc/msg56211.html I think this discussion even suggested some viable solutions, so it just be a matter of sending a patch :-) [2] http://forum.hyperion-entertainment.com/viewtopic.php?f=58&t=4349&start=20#p49012 Kind regards Uffe
Re: [FSL P5020 P5040 PPC] Onboard SD card doesn't work anymore after the 'mmc-v5.4-2' updates
On Thu, 16 Jan 2020 at 12:18, Christian Zigotzky wrote: > > Hi All, > > We still need the attached patch for our onboard SD card interface > [1,2]. Could you please add this patch to the tree? No, because according to previous discussion that isn't the correct solution and more importantly it will break other archs (if I recall correctly). Looks like someone from the ppc community needs to pick up the ball. > > Thanks, > Christian > > [1] https://www.spinics.net/lists/linux-mmc/msg56211.html I think this discussion even suggested some viable solutions, so it just be a matter of sending a patch :-) > [2] > http://forum.hyperion-entertainment.com/viewtopic.php?f=58&t=4349&start=20#p49012 > Kind regards Uffe
[FSL P5020 P5040 PPC] Onboard SD card doesn't work anymore after the 'mmc-v5.4-2' updates
Hi All,
We still need the attached patch for our onboard SD card interface
[1,2]. Could you please add this patch to the tree?
Thanks,
Christian
[1] https://www.spinics.net/lists/linux-mmc/msg56211.html
[2]
http://forum.hyperion-entertainment.com/viewtopic.php?f=58&t=4349&start=20#p49012
diff -rupN a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
--- a/arch/powerpc/kernel/setup-common.c 2019-12-03 18:05:52.436070217 +0100
+++ b/arch/powerpc/kernel/setup-common.c 2019-12-03 18:03:20.316629696 +0100
@@ -780,6 +780,22 @@ static int __init check_cache_coherency(
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 -rupN a/drivers/of/address.c b/drivers/of/address.c
--- a/drivers/of/address.c 2019-12-03 18:05:57.332052212 +0100
+++ b/drivers/of/address.c 2019-12-03 18:03:20.320629681 +0100
@@ -990,6 +990,14 @@ out:
return ret;
}
+/*
+ * 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
@@ -999,8 +1007,12 @@ out:
*/
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);
