| From 6befad9e7d49b61a69cf921496211fcdbed39a24 Mon Sep 17 00:00:00 2001 |
| From: Takeshi Kihara <takeshi.kihara.df@renesas.com> |
| Date: Mon, 20 Jul 2015 01:39:59 +0900 |
| Subject: [PATCH 234/326] mmc: tmio: Fix timeout value for command request |
| |
| Fix the problem which timeout occurs at the time of command request with |
| several cards. |
| |
| The timeout value was insufficient as a verification of several cards, |
| so it was changed 5 seconds from 2 seconds. |
| |
| Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> |
| Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| (cherry picked from commit 0df9d2eae5e1092b07eaab6b989c2ff14115cab5) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/tmio_mmc_pio.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c |
| index dba7e1c19dd7..988e498467df 100644 |
| --- a/drivers/mmc/host/tmio_mmc_pio.c |
| +++ b/drivers/mmc/host/tmio_mmc_pio.c |
| @@ -83,6 +83,8 @@ static int tmio_mmc_next_sg(struct tmio_mmc_host *host) |
| return --host->sg_len; |
| } |
| |
| +#define CMDREQ_TIMEOUT 5000 |
| + |
| #ifdef CONFIG_MMC_DEBUG |
| |
| #define STATUS_TO_TEXT(a, status, i) \ |
| @@ -230,7 +232,7 @@ static void tmio_mmc_reset_work(struct work_struct *work) |
| */ |
| if (IS_ERR_OR_NULL(mrq) |
| || time_is_after_jiffies(host->last_req_ts + |
| - msecs_to_jiffies(2000))) { |
| + msecs_to_jiffies(CMDREQ_TIMEOUT))) { |
| spin_unlock_irqrestore(&host->lock, flags); |
| return; |
| } |
| @@ -818,7 +820,7 @@ static void tmio_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq) |
| ret = tmio_mmc_start_command(host, mrq->cmd); |
| if (!ret) { |
| schedule_delayed_work(&host->delayed_reset_work, |
| - msecs_to_jiffies(2000)); |
| + msecs_to_jiffies(CMDREQ_TIMEOUT)); |
| return; |
| } |
| |
| -- |
| 2.6.2 |
| |
