This series is to backport the upstream patches that fixes busy detection for long operation mmc commands by implementing Tegra specific timeout callback to switch between finite and infinite HW busy detection wait modes.
Sowjanya Komatineni (2): sdhci: tegra: Implement Tegra specific set_timeout callback sdhci: tegra: Enable MMC_CAP_WAIT_WHILE_BUSY host capability
drivers/mmc/host/sdhci-tegra.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
commit 5e958e4aacf4 ("sdhci: tegra: Implement Tegra specific set_timeout callback")
Tegra host supports HW busy detection and timeouts based on the count programmed in SDHCI_TIMEOUT_CONTROL register and max busy timeout it supports is 11s in finite busy wait mode.
Some operations like SLEEP_AWAKE, ERASE and flush cache through SWITCH commands take longer than 11s and Tegra host supports infinite HW busy wait mode where HW waits forever till the card is busy without HW timeout.
This patch implements Tegra specific set_timeout sdhci_ops to allow switching between finite and infinite HW busy detection wait modes based on the device command expected operation time.
Cc: stable@vger.kernel.org Signed-off-by: Sowjanya Komatineni skomatineni@nvidia.com --- drivers/mmc/host/sdhci-tegra.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index a25c3a4..fa8f6a4 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -45,6 +45,7 @@ #define SDHCI_TEGRA_CAP_OVERRIDES_DQS_TRIM_SHIFT 8
#define SDHCI_TEGRA_VENDOR_MISC_CTRL 0x120 +#define SDHCI_MISC_CTRL_ERASE_TIMEOUT_LIMIT BIT(0) #define SDHCI_MISC_CTRL_ENABLE_SDR104 0x8 #define SDHCI_MISC_CTRL_ENABLE_SDR50 0x10 #define SDHCI_MISC_CTRL_ENABLE_SDHCI_SPEC_300 0x20 @@ -1227,6 +1228,34 @@ static u32 sdhci_tegra_cqhci_irq(struct sdhci_host *host, u32 intmask) return 0; }
+static void tegra_sdhci_set_timeout(struct sdhci_host *host, + struct mmc_command *cmd) +{ + u32 val; + + /* + * HW busy detection timeout is based on programmed data timeout + * counter and maximum supported timeout is 11s which may not be + * enough for long operations like cache flush, sleep awake, erase. + * + * ERASE_TIMEOUT_LIMIT bit of VENDOR_MISC_CTRL register allows + * host controller to wait for busy state until the card is busy + * without HW timeout. + * + * So, use infinite busy wait mode for operations that may take + * more than maximum HW busy timeout of 11s otherwise use finite + * busy wait mode. + */ + val = sdhci_readl(host, SDHCI_TEGRA_VENDOR_MISC_CTRL); + if (cmd && cmd->busy_timeout >= 11 * HZ) + val |= SDHCI_MISC_CTRL_ERASE_TIMEOUT_LIMIT; + else + val &= ~SDHCI_MISC_CTRL_ERASE_TIMEOUT_LIMIT; + sdhci_writel(host, val, SDHCI_TEGRA_VENDOR_MISC_CTRL); + + __sdhci_set_timeout(host, cmd); +} + static const struct cqhci_host_ops sdhci_tegra_cqhci_ops = { .write_l = tegra_cqhci_writel, .enable = sdhci_tegra_cqe_enable, @@ -1366,6 +1395,7 @@ static const struct sdhci_ops tegra210_sdhci_ops = { .set_uhs_signaling = tegra_sdhci_set_uhs_signaling, .voltage_switch = tegra_sdhci_voltage_switch, .get_max_clock = tegra_sdhci_get_max_clock, + .set_timeout = tegra_sdhci_set_timeout, };
static const struct sdhci_pltfm_data sdhci_tegra210_pdata = { @@ -1403,6 +1433,7 @@ static const struct sdhci_ops tegra186_sdhci_ops = { .voltage_switch = tegra_sdhci_voltage_switch, .get_max_clock = tegra_sdhci_get_max_clock, .irq = sdhci_tegra_cqhci_irq, + .set_timeout = tegra_sdhci_set_timeout, };
static const struct sdhci_pltfm_data sdhci_tegra186_pdata = {
commit ff124c31ccd7 ("sdhci: tegra: Enable MMC_CAP_WAIT_WHILE_BUSY host capability")
Tegra sdhci host supports HW busy detection of the device busy signaling over data0 lane.
So, this patch enables host capability MMC_CAP_wAIT_WHILE_BUSY.
Cc: stable@vger.kernel.org Signed-off-by: Sowjanya Komatineni skomatineni@nvidia.com --- drivers/mmc/host/sdhci-tegra.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index fa8f6a4..1c381f8 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -1580,6 +1580,8 @@ static int sdhci_tegra_probe(struct platform_device *pdev) if (rc) goto err_parse_dt;
+ host->mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY; + if (tegra_host->soc_data->nvquirks & NVQUIRK_ENABLE_DDR50) host->mmc->caps |= MMC_CAP_1_8V_DDR;
On Fri, Apr 24, 2020 at 01:06:04PM -0700, Sowjanya Komatineni wrote:
This series is to backport the upstream patches that fixes busy detection for long operation mmc commands by implementing Tegra specific timeout callback to switch between finite and infinite HW busy detection wait modes.
Sowjanya Komatineni (2): sdhci: tegra: Implement Tegra specific set_timeout callback sdhci: tegra: Enable MMC_CAP_WAIT_WHILE_BUSY host capability
What regression do these patches fix?
On 4/24/20 6:45 PM, Sasha Levin wrote:
External email: Use caution opening links or attachments
On Fri, Apr 24, 2020 at 01:06:04PM -0700, Sowjanya Komatineni wrote:
This series is to backport the upstream patches that fixes busy detection for long operation mmc commands by implementing Tegra specific timeout callback to switch between finite and infinite HW busy detection wait modes.
Sowjanya Komatineni (2): sdhci: tegra: Implement Tegra specific set_timeout callback sdhci: tegra: Enable MMC_CAP_WAIT_WHILE_BUSY host capability
What regression do these patches fix?
This isn't a regression as we don't have any known failures as of today with the specific mmc devices we are using on our platforms.
But this patch fixes a long outstanding bug for sdhci-tegra to handle long busy wait for mmc command operations that may take longer than host max busy timeout. So, this is something that's missing from the beginning and good to have.
-- Thanks, Sasha
On Fri, Apr 24, 2020 at 07:42:16PM -0700, Sowjanya Komatineni wrote:
On 4/24/20 6:45 PM, Sasha Levin wrote:
External email: Use caution opening links or attachments
On Fri, Apr 24, 2020 at 01:06:04PM -0700, Sowjanya Komatineni wrote:
This series is to backport the upstream patches that fixes busy detection for long operation mmc commands by implementing Tegra specific timeout callback to switch between finite and infinite HW busy detection wait modes.
Sowjanya Komatineni (2): sdhci: tegra: Implement Tegra specific set_timeout callback sdhci: tegra: Enable MMC_CAP_WAIT_WHILE_BUSY host capability
What regression do these patches fix?
This isn't a regression as we don't have any known failures as of today with the specific mmc devices we are using on our platforms.
Have you read: https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html ?
But this patch fixes a long outstanding bug for sdhci-tegra to handle long busy wait for mmc command operations that may take longer than host max busy timeout. So, this is something that's missing from the beginning and good to have.
So it's a new feature?
On Sat, Apr 25, 2020 at 09:04:08AM +0200, Greg KH wrote:
On Fri, Apr 24, 2020 at 07:42:16PM -0700, Sowjanya Komatineni wrote:
On 4/24/20 6:45 PM, Sasha Levin wrote:
External email: Use caution opening links or attachments
On Fri, Apr 24, 2020 at 01:06:04PM -0700, Sowjanya Komatineni wrote:
This series is to backport the upstream patches that fixes busy detection for long operation mmc commands by implementing Tegra specific timeout callback to switch between finite and infinite HW busy detection wait modes.
Sowjanya Komatineni (2): sdhci: tegra: Implement Tegra specific set_timeout callback sdhci: tegra: Enable MMC_CAP_WAIT_WHILE_BUSY host capability
What regression do these patches fix?
This isn't a regression as we don't have any known failures as of today with the specific mmc devices we are using on our platforms.
Have you read: https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html ?
But this patch fixes a long outstanding bug for sdhci-tegra to handle long busy wait for mmc command operations that may take longer than host max busy timeout. So, this is something that's missing from the beginning and good to have.
So it's a new feature?
Dropped from my queues due to lack of response.
greg k-h
linux-stable-mirror@lists.linaro.org