| Message ID | 20190603183740.239031-3-dianders@chromium.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | brcmfmac: sdio: Deal better w/ transmission errors waking from idle | expand |
On 6/3/2019 8:37 PM, 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. > > However, if a command is expected to sometimes cause transfer errors > then these transfer errors shouldn't cause a re-tuning. This > re-tuning will be a needless waste of time. One example case where a > transfer is expected to cause errors is when transitioning between > idle (sometimes referred to as "sleep" in Broadcom code) and active > state on certain Broadcom WiFi cards. Specifically if the card was > already transitioning between states when the command was sent it > could cause an error on the SDIO bus. > > 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. > > NOTE: this makes the assumption that the card is already tuned well > enough that it's OK to disable the auto-retuning during one of these > error-prone situations. Presumably the driver code performing the > error-prone transfer knows how to recover / retry from errors. ...and > after we can get back to a state where transfers are no longer > error-prone then we can enable the auto-retuning again. If we truly > find ourselves in a case where the card needs to be retuned sometimes > to handle one of these error-prone transfers then we can always try a > few transfers first without auto-retuning and then re-try with > auto-retuning if the first few fail. > > Without this change on rk3288-veyron-minnie I periodically see this in > the logs of a machine just sitting there idle: > dwmmc_rockchip ff0d0000.dwmmc: Successfully tuned phase to XYZ > > Fixes: bd11e8bd03ca ("mmc: core: Flag re-tuning is needed on CRC errors") > Signed-off-by: Douglas Anderson <dianders@chromium.org> > --- > Note that are are a whole boatload of different ways that we could > provide an API for the Broadcom WiFi SDIO driver. This patch > illustrates one way but if maintainers feel strongly that this is too > ugly and have a better idea then I can give it a shot too. From a > purist point of view I kinda felt that the "expect errors" really > belonged as part of the mmc_request structure, but getting it into > there meant changing a whole pile of core SD/MMC APIs. Simply adding > it to the host seemed to match the current style better and was a less > intrusive change. Hi Doug, Sorry for bringing this up, but there used to be an issue with retuning in general, ie. the device handled tuning command 19 only once after startup. I guess that is no longer an issue given your results. I guess the problem goes away when you disable device sleep functionality. No what you want in terms of power consumption, but would be good to know. You can disable it with below patch. Regards, Arend --- diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers index 15a40fd..18e90bd 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -307,7 +307,7 @@ struct rte_console { #define BRCMF_IDLE_ACTIVE 0 /* Do not request any SD clock change * when idle */ -#define BRCMF_IDLE_INTERVAL 1 +#define BRCMF_IDLE_INTERVAL 0 #define KSO_WAIT_US 50 #define MAX_KSO_ATTEMPTS (PMU_MAX_TRANSITION_DLY/KSO_WAIT_US)
Hi, On Wed, Jun 5, 2019 at 12:54 AM Arend Van Spriel <arend.vanspriel@broadcom.com> wrote: > > On 6/3/2019 8:37 PM, 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. > > > > However, if a command is expected to sometimes cause transfer errors > > then these transfer errors shouldn't cause a re-tuning. This > > re-tuning will be a needless waste of time. One example case where a > > transfer is expected to cause errors is when transitioning between > > idle (sometimes referred to as "sleep" in Broadcom code) and active > > state on certain Broadcom WiFi cards. Specifically if the card was > > already transitioning between states when the command was sent it > > could cause an error on the SDIO bus. > > > > 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. > > > > NOTE: this makes the assumption that the card is already tuned well > > enough that it's OK to disable the auto-retuning during one of these > > error-prone situations. Presumably the driver code performing the > > error-prone transfer knows how to recover / retry from errors. ...and > > after we can get back to a state where transfers are no longer > > error-prone then we can enable the auto-retuning again. If we truly > > find ourselves in a case where the card needs to be retuned sometimes > > to handle one of these error-prone transfers then we can always try a > > few transfers first without auto-retuning and then re-try with > > auto-retuning if the first few fail. > > > > Without this change on rk3288-veyron-minnie I periodically see this in > > the logs of a machine just sitting there idle: > > dwmmc_rockchip ff0d0000.dwmmc: Successfully tuned phase to XYZ > > > > Fixes: bd11e8bd03ca ("mmc: core: Flag re-tuning is needed on CRC errors") > > Signed-off-by: Douglas Anderson <dianders@chromium.org> > > --- > > Note that are are a whole boatload of different ways that we could > > provide an API for the Broadcom WiFi SDIO driver. This patch > > illustrates one way but if maintainers feel strongly that this is too > > ugly and have a better idea then I can give it a shot too. From a > > purist point of view I kinda felt that the "expect errors" really > > belonged as part of the mmc_request structure, but getting it into > > there meant changing a whole pile of core SD/MMC APIs. Simply adding > > it to the host seemed to match the current style better and was a less > > intrusive change. > > Hi Doug, > > Sorry for bringing this up, but there used to be an issue with retuning > in general, ie. the device handled tuning command 19 only once after > startup. I guess that is no longer an issue given your results. Right. It definitely used to just happen once at bootup and you were out of luck if that value was bad for some reason or if conditions changed. In cases in my own personal experience it was actually fine to just tune once at bootup once all the tuning bugs in the controller were fixed. ...but I can imagine that some controllers could use delay elements that drift more. ...and in any case if you're getting CRC errors trying a re-tuning seems a sensible thing to do anyway (unless the CRC error was expected). Looking at commit bd11e8bd03ca ("mmc: core: Flag re-tuning is needed on CRC errors") you can definitely see evidence that tuning can happen again after bootup. > I guess > the problem goes away when you disable device sleep functionality. No > what you want in terms of power consumption, but would be good to know. > You can disable it with below patch. I can try testing this if it's useful, but I'm not sure what it will prove. I definitely don't want to disable device sleep, so it's not a long term solution. Are you just looking for extra evidence that this is indeed my problem? I don't think I need any extra evidence, do I? The fact that patch #3 in this series fixes my problems (plus debugging I did to arrive at that patch) means we absolutely know that brcmf_sdio_kso_control() is responsible for the CRC errors that caused the unneeded tuning. Setting BRCMF_IDLE_INTERVAL to 0 will effectively prevent brcmf_sdio_kso_control() from doing anything useful (except in full system suspend, but that's not the case I was testing anyway). -Doug
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 6db36dc870b5..ba4f71aa8cd9 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -144,8 +144,9 @@ void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq) int err = cmd->error; /* Flag re-tuning needed on CRC errors */ - if ((cmd->opcode != MMC_SEND_TUNING_BLOCK && - cmd->opcode != MMC_SEND_TUNING_BLOCK_HS200) && + if (cmd->opcode != MMC_SEND_TUNING_BLOCK && + cmd->opcode != MMC_SEND_TUNING_BLOCK_HS200 && + !host->expect_errors && (err == -EILSEQ || (mrq->sbc && mrq->sbc->error == -EILSEQ) || (mrq->data && mrq->data->error == -EILSEQ) || (mrq->stop && mrq->stop->error == -EILSEQ))) @@ -2163,6 +2164,28 @@ int mmc_sw_reset(struct mmc_host *host) } EXPORT_SYMBOL(mmc_sw_reset); +void mmc_expect_errors_begin(struct mmc_host *host) +{ + unsigned long flags; + + spin_lock_irqsave(&host->lock, flags); + WARN_ON(host->expect_errors); + host->expect_errors = true; + spin_unlock_irqrestore(&host->lock, flags); +} +EXPORT_SYMBOL_GPL(mmc_expect_errors_begin); + +void mmc_expect_errors_end(struct mmc_host *host) +{ + unsigned long flags; + + spin_lock_irqsave(&host->lock, flags); + WARN_ON(!host->expect_errors); + host->expect_errors = false; + spin_unlock_irqrestore(&host->lock, flags); +} +EXPORT_SYMBOL_GPL(mmc_expect_errors_end); + static int mmc_rescan_try_freq(struct mmc_host *host, unsigned freq) { host->f_init = freq; diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h index 134a6483347a..02a13abf0cda 100644 --- a/include/linux/mmc/core.h +++ b/include/linux/mmc/core.h @@ -178,6 +178,8 @@ int mmc_wait_for_cmd(struct mmc_host *host, struct mmc_command *cmd, int mmc_hw_reset(struct mmc_host *host); int mmc_sw_reset(struct mmc_host *host); +void mmc_expect_errors_begin(struct mmc_host *host); +void mmc_expect_errors_end(struct mmc_host *host); void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card); #endif /* LINUX_MMC_CORE_H */ diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 43d0f0c496f6..8d553fb8c834 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -398,6 +398,7 @@ struct mmc_host { unsigned int retune_now:1; /* do re-tuning at next req */ unsigned int retune_paused:1; /* re-tuning is temporarily disabled */ unsigned int use_blk_mq:1; /* use blk-mq */ + unsigned int expect_errors:1; /* don't trigger retune upon errors */ int rescan_disable; /* disable card detection */ int rescan_entered; /* used with nonremovable devices */
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. However, if a command is expected to sometimes cause transfer errors then these transfer errors shouldn't cause a re-tuning. This re-tuning will be a needless waste of time. One example case where a transfer is expected to cause errors is when transitioning between idle (sometimes referred to as "sleep" in Broadcom code) and active state on certain Broadcom WiFi cards. Specifically if the card was already transitioning between states when the command was sent it could cause an error on the SDIO bus. 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. NOTE: this makes the assumption that the card is already tuned well enough that it's OK to disable the auto-retuning during one of these error-prone situations. Presumably the driver code performing the error-prone transfer knows how to recover / retry from errors. ...and after we can get back to a state where transfers are no longer error-prone then we can enable the auto-retuning again. If we truly find ourselves in a case where the card needs to be retuned sometimes to handle one of these error-prone transfers then we can always try a few transfers first without auto-retuning and then re-try with auto-retuning if the first few fail. Without this change on rk3288-veyron-minnie I periodically see this in the logs of a machine just sitting there idle: dwmmc_rockchip ff0d0000.dwmmc: Successfully tuned phase to XYZ Fixes: bd11e8bd03ca ("mmc: core: Flag re-tuning is needed on CRC errors") Signed-off-by: Douglas Anderson <dianders@chromium.org> --- Note that are are a whole boatload of different ways that we could provide an API for the Broadcom WiFi SDIO driver. This patch illustrates one way but if maintainers feel strongly that this is too ugly and have a better idea then I can give it a shot too. From a purist point of view I kinda felt that the "expect errors" really belonged as part of the mmc_request structure, but getting it into there meant changing a whole pile of core SD/MMC APIs. Simply adding it to the host seemed to match the current style better and was a less intrusive change. Changes in v2: - Updated commit message to clarify based on discussion of v1. drivers/mmc/core/core.c | 27 +++++++++++++++++++++++++-- include/linux/mmc/core.h | 2 ++ include/linux/mmc/host.h | 1 + 3 files changed, 28 insertions(+), 2 deletions(-)