mmc: sdhci: Allow for long command timeouts
Adrian Hunter
maintainerPATCH 1/1 mmc: sdhci: Allow for long command timeouts
The driver has a timer with a 10 second timeout to catch devices that stop responding. However it is possible for commands to take even longer than that. Change the timer timeout to reflect the command timeout.
--- drivers/mmc/host/sdhci.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci.c +6 -1
@@ -1013,7 +1013,12 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)mdelay (1 ); } -mod_timer (&host->timer, jiffies +10 *HZ ); + timeout = jiffies; +if (!cmd->data && cmd->cmd_timeout_ms >9000 ) + timeout +=DIV_ROUND_UP (cmd->cmd_timeout_ms,1000 ) *HZ +HZ ; +else + timeout +=10 *HZ ; +mod_timer (&host->timer, timeout); host->cmd = cmd;
Signature · 1 line
1.7.11.7
Adrian Hunter
maintainerHi Chris
What about this one?
Regards
Adrian
Quoted 30 lines · Adrian Hunter
The driver has a timer with a 10 second timeout to catch devices that stop responding. However it is possible for commands to take even longer than that. Change the timer timeout to reflect the command timeout.
Signed-off-by Adrian Hunter <[email protected]>--- drivers/mmc/host/sdhci.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/mmc/host/sdhci.c +6
-1@@ -1013,7 +1013,12 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)mdelay (1 ); } -mod_timer (&host->timer, jiffies +10 *HZ ); + timeout = jiffies; +if (!cmd->data && cmd->cmd_timeout_ms >9000 ) + timeout +=DIV_ROUND_UP (cmd->cmd_timeout_ms,1000 ) *HZ +HZ ; +else + timeout +=10 *HZ ; +mod_timer (&host->timer, timeout); host->cmd = cmd;
Adrian Hunter
maintainerPing?
Quoted 41 lines · Adrian Hunter
Hi Chris
What about this one?
Regards
AdrianQuoted 30 lines · Adrian Hunter
The driver has a timer with a 10 second timeout to catch devices that stop responding. However it is possible for commands to take even longer than that. Change the timer timeout to reflect the command timeout.
Signed-off-by Adrian Hunter <[email protected]>--- drivers/mmc/host/sdhci.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/mmc/host/sdhci.c +6
-1@@ -1013,7 +1013,12 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)mdelay (1 ); } -mod_timer (&host->timer, jiffies +10 *HZ ); + timeout = jiffies; +if (!cmd->data && cmd->cmd_timeout_ms >9000 ) + timeout +=DIV_ROUND_UP (cmd->cmd_timeout_ms,1000 ) *HZ +HZ ; +else + timeout +=10 *HZ ; +mod_timer (&host->timer, timeout); host->cmd = cmd;
Adrian Hunter
maintainerPing?
Quoted 48 lines · Adrian Hunter
Ping?
Quoted 41 lines · Adrian Hunter
Hi Chris
What about this one?
Regards
AdrianQuoted 30 lines · Adrian Hunter
The driver has a timer with a 10 second timeout to catch devices that stop responding. However it is possible for commands to take even longer than that. Change the timer timeout to reflect the command timeout.
Signed-off-by Adrian Hunter <[email protected]>--- drivers/mmc/host/sdhci.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/mmc/host/sdhci.c +6
-1@@ -1013,7 +1013,12 @@ void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)mdelay (1 ); } -mod_timer (&host->timer, jiffies +10 *HZ ); + timeout = jiffies; +if (!cmd->data && cmd->cmd_timeout_ms >9000 ) + timeout +=DIV_ROUND_UP (cmd->cmd_timeout_ms,1000 ) *HZ +HZ ; +else + timeout +=10 *HZ ; +mod_timer (&host->timer, timeout); host->cmd = cmd;
Hi Adrian,
Quoted 7 lines · Adrian Hunter
The driver has a timer with a 10 second timeout to catch devices that stop responding. However it is possible for commands to take even longer than that. Change the timer timeout to reflect the command timeout.
Signed-off-by Adrian Hunter <[email protected]>
Thanks, pushed to mmc-next for 3.14, sorry for the delay.
- Chris.
Signature · 1 line
Chris Ball <[email protected]> <http://printf.net/>