Re: [PATCH 2/3] mmc: core: API for temporarily disabling auto-retuning due to errors
Hi, On Tue, May 28, 2019 at 4:45 AM Adrian Hunter wrote: > > On 28/05/19 2:21 PM, Arend Van Spriel wrote: > > > > > > On 5/28/2019 12:04 PM, Adrian Hunter wrote: > >> On 26/05/19 9:42 PM, Arend Van Spriel wrote: > >>> On 5/18/2019 12:54 AM, Douglas Anderson wrote: > Normally when the MMC core sees an "-EILSEQ" error returned by a host > controller then it will trigger a retuning of the card. This is > generally a good idea. > >>> > >>> Probably a question for Adrian, but how is this retuning scheduled. I > >>> recall > >>> seeing something in mmc_request_done. How about deferring the retuning > >>> upon > >>> a release host or is that too sdio specific. > >> > >> Below is what I have been carrying the last 4 years. But according to > >> Douglas' > >> patch, the release would need to be further down. See 2nd diff below. > >> Would that work? > > > > That makes sense. The loop is needed because the device can be a bit bone > > headed. So indeed after the loop the device should be awake and able to > > handle CMD19. IMO I'd rather not _defer_ the re-tuning. I believe the correct thing is to not schedule the re-tuning at all in response to the IO errors. That's what my patch does. Specifically the IO errors that come up in this case are not due to being "out of tune". They are due to the fact that the other SDIO card may be in a transitory state and putting garbage on the bus. Scheduling a retuning for later would be just a waste of time and needlessly tie up the bus for the retune. ...or am I confused? > What if tuning is needed to read SBSDIO_FUNC1_SLEEPCSR successfully? Personally I think this would be pretty unlikely. If we're at this point we've already talked to the card quite a bit so we should have a tuning that's pretty good. If we're just slightly out of tune then we should still get through the loop with a few retries and then we can detect that we're out of tune later, with a more reliable command. However, if you're worried about this, I can always re-enable the old behavior if we have already looped a few times. I suppose I could increase the loop duration/count slightly too... Please let me know one way or the other. -Doug
Re: [PATCH 2/3] mmc: core: API for temporarily disabling auto-retuning due to errors
On 28/05/19 2:21 PM, Arend Van Spriel wrote: > > > On 5/28/2019 12:04 PM, Adrian Hunter wrote: >> On 26/05/19 9:42 PM, Arend Van Spriel wrote: >>> On 5/18/2019 12:54 AM, Douglas Anderson wrote: Normally when the MMC core sees an "-EILSEQ" error returned by a host controller then it will trigger a retuning of the card. This is generally a good idea. >>> >>> Probably a question for Adrian, but how is this retuning scheduled. I recall >>> seeing something in mmc_request_done. How about deferring the retuning upon >>> a release host or is that too sdio specific. >> >> Below is what I have been carrying the last 4 years. But according to >> Douglas' >> patch, the release would need to be further down. See 2nd diff below. >> Would that work? > > That makes sense. The loop is needed because the device can be a bit bone > headed. So indeed after the loop the device should be awake and able to > handle CMD19. What if tuning is needed to read SBSDIO_FUNC1_SLEEPCSR successfully?
Re: [PATCH 2/3] mmc: core: API for temporarily disabling auto-retuning due to errors
On 5/28/2019 12:04 PM, Adrian Hunter wrote: On 26/05/19 9:42 PM, Arend Van Spriel wrote: On 5/18/2019 12:54 AM, Douglas Anderson wrote: Normally when the MMC core sees an "-EILSEQ" error returned by a host controller then it will trigger a retuning of the card. This is generally a good idea. Probably a question for Adrian, but how is this retuning scheduled. I recall seeing something in mmc_request_done. How about deferring the retuning upon a release host or is that too sdio specific. Below is what I have been carrying the last 4 years. But according to Douglas' patch, the release would need to be further down. See 2nd diff below. Would that work? That makes sense. The loop is needed because the device can be a bit bone headed. So indeed after the loop the device should be awake and able to handle CMD19. Regards, Arend
Re: [PATCH 2/3] mmc: core: API for temporarily disabling auto-retuning due to errors
On 26/05/19 9:42 PM, Arend Van Spriel wrote:
> On 5/18/2019 12:54 AM, Douglas Anderson wrote:
>> Normally when the MMC core sees an "-EILSEQ" error returned by a host
>> controller then it will trigger a retuning of the card. This is
>> generally a good idea.
>
> Probably a question for Adrian, but how is this retuning scheduled. I recall
> seeing something in mmc_request_done. How about deferring the retuning upon
> a release host or is that too sdio specific.
Below is what I have been carrying the last 4 years. But according to Douglas'
patch, the release would need to be further down. See 2nd diff below.
Would that work?
diff --git a/drivers/mmc/core/sdio_io.c b/drivers/mmc/core/sdio_io.c
index 3f67fbbe0d75..7a81a503541b 100644
--- a/drivers/mmc/core/sdio_io.c
+++ b/drivers/mmc/core/sdio_io.c
@@ -16,6 +16,7 @@
#include
#include
+#include "host.h"
#include "sdio_ops.h"
#include "core.h"
#include "card.h"
@@ -738,3 +739,15 @@ int sdio_set_host_pm_flags(struct sdio_func *func,
mmc_pm_flag_t flags)
return 0;
}
EXPORT_SYMBOL_GPL(sdio_set_host_pm_flags);
+
+void sdio_retune_hold_now(struct sdio_func *func)
+{
+ mmc_retune_hold_now(func->card->host);
+}
+EXPORT_SYMBOL_GPL(sdio_retune_hold_now);
+
+void sdio_retune_release(struct sdio_func *func)
+{
+ mmc_retune_release(func->card->host);
+}
+EXPORT_SYMBOL_GPL(sdio_retune_release);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 22b73da42822..c915c39d519f 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -679,6 +679,11 @@ brcmf_sdio_kso_control(struct brcmf_sdio *bus, bool on)
brcmf_dbg(TRACE, "Enter: on=%d\n", on);
wr_val = (on << SBSDIO_FUNC1_SLEEPCSR_KSO_SHIFT);
+
+ /* Cannot re-tune if device is asleep */
+ if (on)
+ sdio_retune_hold_now(bus->sdiodev->func1);
+
/* 1st KSO write goes to AOS wake up core if device is asleep */
brcmf_sdiod_writeb(bus->sdiodev, SBSDIO_FUNC1_SLEEPCSR, wr_val, );
@@ -691,6 +696,7 @@ brcmf_sdio_kso_control(struct brcmf_sdio *bus, bool on)
return err;
if (on) {
+ sdio_retune_release(bus->sdiodev->func1);
/* device WAKEUP through KSO:
* write bit 0 & read back until
* both bits 0 (kso bit) & 1 (dev on status) are set
diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h
index 5685805533b5..85c24b0694d7 100644
--- a/include/linux/mmc/sdio_func.h
+++ b/include/linux/mmc/sdio_func.h
@@ -171,4 +171,7 @@ extern void sdio_f0_writeb(struct sdio_func *func, unsigned
char b,
extern mmc_pm_flag_t sdio_get_host_pm_caps(struct sdio_func *func);
extern int sdio_set_host_pm_flags(struct sdio_func *func, mmc_pm_flag_t flags);
+extern void sdio_retune_hold_now(struct sdio_func *func);
+extern void sdio_retune_release(struct sdio_func *func);
+
#endif /* LINUX_MMC_SDIO_FUNC_H */
diff --git a/drivers/mmc/core/sdio_io.c b/drivers/mmc/core/sdio_io.c
index 3f67fbbe0d75..7a81a503541b 100644
--- a/drivers/mmc/core/sdio_io.c
+++ b/drivers/mmc/core/sdio_io.c
@@ -16,6 +16,7 @@
#include
#include
+#include "host.h"
#include "sdio_ops.h"
#include "core.h"
#include "card.h"
@@ -738,3 +739,15 @@ int sdio_set_host_pm_flags(struct sdio_func *func,
mmc_pm_flag_t flags)
return 0;
}
EXPORT_SYMBOL_GPL(sdio_set_host_pm_flags);
+
+void sdio_retune_hold_now(struct sdio_func *func)
+{
+ mmc_retune_hold_now(func->card->host);
+}
+EXPORT_SYMBOL_GPL(sdio_retune_hold_now);
+
+void sdio_retune_release(struct sdio_func *func)
+{
+ mmc_retune_release(func->card->host);
+}
+EXPORT_SYMBOL_GPL(sdio_retune_release);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 22b73da42822..50c153932683 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -679,6 +679,11 @@ brcmf_sdio_kso_control(struct brcmf_sdio *bus, bool on)
brcmf_dbg(TRACE, "Enter: on=%d\n", on);
wr_val = (on << SBSDIO_FUNC1_SLEEPCSR_KSO_SHIFT);
+
+ /* Cannot re-tune if device is asleep */
+ if (on)
+ sdio_retune_hold_now(bus->sdiodev->func1);
+
/* 1st KSO write goes to AOS wake up core if device is asleep */
brcmf_sdiod_writeb(bus->sdiodev, SBSDIO_FUNC1_SLEEPCSR, wr_val, );
@@ -731,6 +736,9 @@ brcmf_sdio_kso_control(struct brcmf_sdio *bus, bool on)
} while (try_cnt++ < MAX_KSO_ATTEMPTS);
+ if (on)
+ sdio_retune_release(bus->sdiodev->func1);
+
if (try_cnt > 2)
brcmf_dbg(SDIO, "try_cnt=%d rd_val=0x%x err=%d\n", try_cnt,
rd_val, err);
diff --git a/include/linux/mmc/sdio_func.h
Re: [PATCH 2/3] mmc: core: API for temporarily disabling auto-retuning due to errors
On 5/18/2019 12:54 AM, Douglas Anderson wrote: Normally when the MMC core sees an "-EILSEQ" error returned by a host controller then it will trigger a retuning of the card. This is generally a good idea. Probably a question for Adrian, but how is this retuning scheduled. I recall seeing something in mmc_request_done. How about deferring the retuning upon a release host or is that too sdio specific. Regards, Arend
Re: [PATCH 2/3] mmc: core: API for temporarily disabling auto-retuning due to errors
On Mon, May 20, 2019 at 10:46:19AM +0200, Arend Van Spriel wrote: > On 5/19/2019 11:06 AM, Wolfram Sang wrote: > > > > > Let's add an API that the SDIO card drivers can call that will > > > temporarily disable the auto-tuning functionality. Then we can add a > > > call to this in the Broadcom WiFi driver and any other driver that > > > might have similar needs. > > > > Can't you fix the WiFi driver to return something else than -EILSEQ > > before calling mmc_request_done() to skip the retuning? > > Not really. mmc_request_done() is for the host controller driver so the wifi > driver is not involved. Uh, right. Brown paper bag, please... signature.asc Description: PGP signature
Re: [PATCH 2/3] mmc: core: API for temporarily disabling auto-retuning due to errors
On 5/19/2019 11:06 AM, Wolfram Sang wrote: Let's add an API that the SDIO card drivers can call that will temporarily disable the auto-tuning functionality. Then we can add a call to this in the Broadcom WiFi driver and any other driver that might have similar needs. Can't you fix the WiFi driver to return something else than -EILSEQ before calling mmc_request_done() to skip the retuning? Not really. mmc_request_done() is for the host controller driver so the wifi driver is not involved. Regards, Arend
Re: [PATCH 2/3] mmc: core: API for temporarily disabling auto-retuning due to errors
> Let's add an API that the SDIO card drivers can call that will > temporarily disable the auto-tuning functionality. Then we can add a > call to this in the Broadcom WiFi driver and any other driver that > might have similar needs. Can't you fix the WiFi driver to return something else than -EILSEQ before calling mmc_request_done() to skip the retuning? signature.asc Description: PGP signature
