Skip to contentSkip to conversation

mmc: sdhci-of-esdhc: Revert "mmc: sdhci-of-esdhc: add erratum A-009204 support"

PATCH In review Rasmus Villemoes 3 participants 5 messages Dec 4, 2019 – Dec 19, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mmc: sdhci-of-esdhc: Revert "mmc: sdhci-of-esdhc: add erratum A-009204 support"

This reverts commit 5dd195522562542bc6ebe6e7bd47890d8b7ca93c.

First, the fix seems to be plain wrong, since the erratum suggests waiting 5ms before setting setting SYSCTL[RSTD], but this msleep() happens after the call of sdhci_reset() which is where that bit gets set (if SDHCI_RESET_DATA is in mask).

Second, walking the whole device tree to figure out if some node has a "fsl,p2020-esdhc" compatible string is hugely expensive - about 70 to 100 us on our mpc8309 board. Walking the device tree is done under a raw_spin_lock, so this is obviously really bad on an -rt system, and a waste of time on all.

In fact, since esdhc_reset() seems to get called around 100 times per second, that mpc8309 now spends 0.8% of its time determining that it is not a p2020. Whether those 100 calls/s are normal or due to some other bug or misconfiguration, regularly hitting a 100 us non-preemptible window is unacceptable.

---

The errata sheet for mpc8309 also mentions A-009204, so I'm not at all opposed to having a fix for that. But it needs to be done properly without causing a huge performance or latency impact. We should probably just add a bit to struct sdhci_esdhc which gets initialized in esdhc_init.

 drivers/mmc/host/sdhci-of-esdhc.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/mmc/host/sdhci-of-esdhc.c +0 -3
index 5cca3fa4610b..7f87a90bf56a 100644
@@ -764,9 +764,6 @@ static void esdhc_reset(struct sdhci_host *host, u8 mask)
 	sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);
 	sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
 
-	if (of_find_compatible_node(NULL, NULL, "fsl,p2020-esdhc"))
-		mdelay(5);
-
 	if (mask & SDHCI_RESET_ALL) {
 		val = sdhci_readl(host, ESDHC_TBCTL);
 		val &= ~ESDHC_TB_EN;
Signature · 1 line
2.23.0
#1 lore raw

ping, any comments on this revert?

Quoted 6 lines · Rasmus Villemoes

This reverts commit 5dd195522562542bc6ebe6e7bd47890d8b7ca93c.

First, the fix seems to be plain wrong, since the erratum suggests waiting 5ms before setting setting SYSCTL[RSTD], but this msleep() happens after the call of sdhci_reset() which is where that bit gets set (if SDHCI_RESET_DATA is in mask).

#2 lore raw
In reply to Rasmus Villemoes
Quoted 14 lines · Rasmus Villemoes

This reverts commit 5dd195522562542bc6ebe6e7bd47890d8b7ca93c.

First, the fix seems to be plain wrong, since the erratum suggests waiting 5ms before setting setting SYSCTL[RSTD], but this msleep() happens after the call of sdhci_reset() which is where that bit gets set (if SDHCI_RESET_DATA is in mask).

Second, walking the whole device tree to figure out if some node has a "fsl,p2020-esdhc" compatible string is hugely expensive - about 70 to 100 us on our mpc8309 board. Walking the device tree is done under a raw_spin_lock, so this is obviously really bad on an -rt system, and a waste of time on all.

Quoted 7 lines

In fact, since esdhc_reset() seems to get called around 100 times per second, that mpc8309 now spends 0.8% of its time determining that it is not a p2020. Whether those 100 calls/s are normal or due to some other bug or misconfiguration, regularly hitting a 100 us non-preemptible window is unacceptable.

Applied for fixes and by adding a stable tag, thanks!

Kind regards
Uffe

Quoted 28 lines

---

The errata sheet for mpc8309 also mentions A-009204, so I'm not at all opposed to having a fix for that. But it needs to be done properly without causing a huge performance or latency impact. We should probably just add a bit to struct sdhci_esdhc which gets initialized in esdhc_init.

 drivers/mmc/host/sdhci-of-esdhc.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/mmc/host/sdhci-of-esdhc.c +0 -4
index 5cca3fa4610b..7f87a90bf56a 100644
@@ -764,9 +764,6 @@ static void esdhc_reset(struct sdhci_host *host, u8 mask)
        sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);
        sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
 
-       if (of_find_compatible_node(NULL, NULL, "fsl,p2020-esdhc"))
-               mdelay(5);
-
        if (mask & SDHCI_RESET_ALL) {
                val = sdhci_readl(host, ESDHC_TBCTL);
                val &= ~ESDHC_TB_EN;
--

2.23.0

#3 lore raw

Yinbo, Yangbo

Quoted 22 lines · Ulf Hansson
Quoted 20 lines · Rasmus Villemoes

This reverts commit 5dd195522562542bc6ebe6e7bd47890d8b7ca93c.

First, the fix seems to be plain wrong, since the erratum suggests waiting 5ms before setting setting SYSCTL[RSTD], but this msleep() happens after the call of sdhci_reset() which is where that bit gets set (if SDHCI_RESET_DATA is in mask).

Second, walking the whole device tree to figure out if some node has a "fsl,p2020-esdhc" compatible string is hugely expensive - about 70 to 100 us on our mpc8309 board. Walking the device tree is done under a raw_spin_lock, so this is obviously really bad on an -rt system, and a waste of time on all.

In fact, since esdhc_reset() seems to get called around 100 times per second, that mpc8309 now spends 0.8% of its time determining that it is not a p2020. Whether those 100 calls/s are normal or due to some other bug or misconfiguration, regularly hitting a 100 us non-preemptible window is unacceptable.

Quoted 3 lines
Quoted 1 line

Applied for fixes and by adding a stable tag, thanks!

Just wanted to highlight, that $subject patch has been applied for fixes, which means we need a new fix the errata A-009204.

Rasmus kind of already hinted on how this could be fixed in a better way, hope this helps.

Kind regards
Uffe

Quoted 28 lines
Quoted 28 lines

---

The errata sheet for mpc8309 also mentions A-009204, so I'm not at all opposed to having a fix for that. But it needs to be done properly without causing a huge performance or latency impact. We should probably just add a bit to struct sdhci_esdhc which gets initialized in esdhc_init.

 drivers/mmc/host/sdhci-of-esdhc.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/mmc/host/sdhci-of-esdhc.c +0 -4
index 5cca3fa4610b..7f87a90bf56a 100644
@@ -764,9 +764,6 @@ static void esdhc_reset(struct sdhci_host *host, u8 mask)
        sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);
        sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
 
-       if (of_find_compatible_node(NULL, NULL, "fsl,p2020-esdhc"))
-               mdelay(5);
-
        if (mask & SDHCI_RESET_ALL) {
                val = sdhci_readl(host, ESDHC_TBCTL);
                val &= ~ESDHC_TB_EN;
--

2.23.0

#4 lore raw
Quoted 39 lines

-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Ulf Hansson
Sent: Wednesday, December 18, 2019 9:40 PM
To: Yinbo Zhu <[email protected]>; Y.b. Lu <[email protected]>
Cc: Adrian Hunter <[email protected]>; Rasmus Villemoes <[email protected]>; [email protected]; Linux Kernel Mailing List <[email protected]>
Subject: Re: [PATCH] mmc: sdhci-of-esdhc: Revert "mmc: sdhci-of-esdhc: add erratum A-009204 support"

Yinbo, Yangbo

Quoted 2 lines · Ulf Hansson

On Wed, 4 Dec 2019 at 09:54, Rasmus Villemoes

Quoted 22 lines · <[email protected]> wrote:
Quoted 21 lines

This reverts commit 5dd195522562542bc6ebe6e7bd47890d8b7ca93c.

First, the fix seems to be plain wrong, since the erratum suggests waiting 5ms before setting setting SYSCTL[RSTD], but this msleep() happens after the call of sdhci_reset() which is where that bit gets set (if SDHCI_RESET_DATA is in mask).

Second, walking the whole device tree to figure out if some node has a "fsl,p2020-esdhc" compatible string is hugely expensive - about 70 to 100 us on our mpc8309 board. Walking the device tree is done under a raw_spin_lock, so this is obviously really bad on an -rt system, and a waste of time on all.

In fact, since esdhc_reset() seems to get called around 100 times per second, that mpc8309 now spends 0.8% of its time determining that it is not a p2020. Whether those 100 calls/s are normal or due to some other bug or misconfiguration, regularly hitting a 100 us non-preemptible window is unacceptable.

Quoted 8 lines
Quoted 1 line

Applied for fixes and by adding a stable tag, thanks!

Just wanted to highlight, that $subject patch has been applied for fixes, which means we need a new fix the errata A-009204.

Rasmus kind of already hinted on how this could be fixed in a better way, hope this helps.

Sorry Uffe, I missed the patch since my name wasn't in TO/CC list. I have sent out a patch for re-implementation.

Thanks!

Quoted 33 lines

Kind regards
Uffe

Quoted 8 lines
Quoted 8 lines

---

The errata sheet for mpc8309 also mentions A-009204, so I'm not at all opposed to having a fix for that. But it needs to be done properly without causing a huge performance or latency impact. We should probably just add a bit to struct sdhci_esdhc which gets initialized in esdhc_init.

Quoted 4 lines

Review

Quoted 4 lines
 drivers/mmc/host/sdhci-of-esdhc.c | 3 ---
 1 file changed, 3 deletions(-)
(quoted diff) +0 -0

b/drivers/mmc/host/sdhci-of-esdhc.c

Quoted 4 lines

drivers/mmc/host/sdhci-of-esdhc.c static void esdhc_reset(struct sdhci_host *host, u8

Quoted 4 lines

index 5cca3fa4610b..7f87a90bf56a 100644

drivers/mmc/host/sdhci-of-esdhc.c +0 -0
@@ -764,9 +764,6 @@ static void esdhc_reset(struct sdhci_host *host, u8

mask)

Quoted 12 lines
Quoted 12 lines
drivers/mmc/host/sdhci-of-esdhc.c +0 -4
        sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);
        sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
 
-       if (of_find_compatible_node(NULL, NULL, "fsl,p2020-esdhc"))
-               mdelay(5);
-
        if (mask & SDHCI_RESET_ALL) {
                val = sdhci_readl(host, ESDHC_TBCTL);
                val &= ~ESDHC_TB_EN;
--

2.23.0