| Message ID | 20201116132206.23518-1-wsa+renesas@sang-engineering.com |
|---|---|
| State | Deferred |
| Headers | show |
| Series | mmc: sdhci: tegra: fix wrong unit with busy_timeout | expand |
On Mon, 16 Nov 2020 at 14:22, Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > > 'busy_timeout' is in msecs, not in jiffies. Use the correct factor. > > Fixes: 5e958e4aacf4 ("sdhci: tegra: Implement Tegra specific set_timeout callback") > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > Acked-by: Sowjanya Komatineni <skomatineni@nvidia.com> > Acked-by: Thierry Reding <treding@nvidia.com> Applied for next, thanks! Kind regards Uffe > --- > > Changes since RFC: > > * added acks > * fixed typo causing build failure ("MSECS" instead of "MSEC") > > drivers/mmc/host/sdhci-tegra.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c > index ed12aacb1c73..41d193fa77bb 100644 > --- a/drivers/mmc/host/sdhci-tegra.c > +++ b/drivers/mmc/host/sdhci-tegra.c > @@ -1272,7 +1272,7 @@ static void tegra_sdhci_set_timeout(struct sdhci_host *host, > * busy wait mode. > */ > val = sdhci_readl(host, SDHCI_TEGRA_VENDOR_MISC_CTRL); > - if (cmd && cmd->busy_timeout >= 11 * HZ) > + if (cmd && cmd->busy_timeout >= 11 * MSEC_PER_SEC) > val |= SDHCI_MISC_CTRL_ERASE_TIMEOUT_LIMIT; > else > val &= ~SDHCI_MISC_CTRL_ERASE_TIMEOUT_LIMIT; > -- > 2.28.0 >
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index ed12aacb1c73..41d193fa77bb 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -1272,7 +1272,7 @@ static void tegra_sdhci_set_timeout(struct sdhci_host *host, * busy wait mode. */ val = sdhci_readl(host, SDHCI_TEGRA_VENDOR_MISC_CTRL); - if (cmd && cmd->busy_timeout >= 11 * HZ) + if (cmd && cmd->busy_timeout >= 11 * MSEC_PER_SEC) val |= SDHCI_MISC_CTRL_ERASE_TIMEOUT_LIMIT; else val &= ~SDHCI_MISC_CTRL_ERASE_TIMEOUT_LIMIT;
'busy_timeout' is in msecs, not in jiffies. Use the correct factor. Fixes: 5e958e4aacf4 ("sdhci: tegra: Implement Tegra specific set_timeout callback") Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Acked-by: Sowjanya Komatineni <skomatineni@nvidia.com> Acked-by: Thierry Reding <treding@nvidia.com> --- Changes since RFC: * added acks * fixed typo causing build failure ("MSECS" instead of "MSEC") drivers/mmc/host/sdhci-tegra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)