[PATCH] mmc: host: sdhci: prevent mmcqd from becoming locked on mmc timeout

2013-11-14 Thread Neal Buckendahl
fixed a condition where device issues a status cmd to sdcard but no response
comes from sdcard. The sdhci irq fires and we hit a timeout case which calls
sdhci_finish_data(). sdhci_finish_data eventually attempt to reset controller
and issues stop cmd. However mmcdq is wait_for_completion(>completion)
in function mmc_wait_for_req_done which never occurs.

Signed-off-by: Neal Buckendahl 
Signed-off-by: Narayanan Gopalakrishnan 
Signed-off-by: Philip Rakity 
---
 drivers/mmc/host/sdhci.c |4 
 1 file changed, 4 insertions(+)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 6785fb1..2a703f0 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -973,6 +973,10 @@ static void sdhci_finish_data(struct sdhci_host *host)
if (data->error) {
sdhci_reset(host, SDHCI_RESET_CMD);
sdhci_reset(host, SDHCI_RESET_DATA);
+   if (data->error == -ETIMEDOUT) {
+   host->mrq->cmd->error = -ETIMEDOUT;
+   tasklet_schedule(>finish_tasklet);
+   }
}
 
sdhci_send_command(host, data->stop);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH] mmc: host: sdhci: prevent mmcqd from becoming locked on mmc timeout

2013-11-14 Thread Neal Buckendahl
fixed a condition where device issues a status cmd to sdcard but no response
comes from sdcard. The sdhci irq fires and we hit a timeout case which calls
sdhci_finish_data(). sdhci_finish_data eventually attempt to reset controller
and issues stop cmd. However mmcdq is wait_for_completion(mrq-completion)
in function mmc_wait_for_req_done which never occurs.

Signed-off-by: Neal Buckendahl nealb...@gmail.com
Signed-off-by: Narayanan Gopalakrishnan narayan.1...@gmail.com
Signed-off-by: Philip Rakity prak...@nvidia.com
---
 drivers/mmc/host/sdhci.c |4 
 1 file changed, 4 insertions(+)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 6785fb1..2a703f0 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -973,6 +973,10 @@ static void sdhci_finish_data(struct sdhci_host *host)
if (data-error) {
sdhci_reset(host, SDHCI_RESET_CMD);
sdhci_reset(host, SDHCI_RESET_DATA);
+   if (data-error == -ETIMEDOUT) {
+   host-mrq-cmd-error = -ETIMEDOUT;
+   tasklet_schedule(host-finish_tasklet);
+   }
}
 
sdhci_send_command(host, data-stop);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH] mmc: host: sdhci: prevent mmcqd from becoming locked on mmc timeout

2013-11-13 Thread Neal Buckendahl
fixed a condition where device issues a status cmd to sdcard but no response
comes from sdcard. The sdhci irq fires and we hit a timeout case which calls
sdhci_finish_data(). sdhci_finish_data eventually attempt to reset controller
and issues stop cmd. However mmcdq is wait_for_completion(>completion)
in function mmc_wait_for_req_done which never occurs.

Signed-off-by: Neal Buckendahl 
Signed-off-by: Narayanan Gopalakrishnan 
Signed-off-by: Philip Rakity 
---
 drivers/mmc/host/sdhci.c |5 +
 1 file changed, 5 insertions(+)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 6785fb1..21620d2 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -973,6 +973,11 @@ static void sdhci_finish_data(struct sdhci_host *host)
if (data->error) {
sdhci_reset(host, SDHCI_RESET_CMD);
sdhci_reset(host, SDHCI_RESET_DATA);
+   if (data->error == -ETIMEDOUT) {
+   host->mrq->cmd->error = -ETIMEDOUT;
+   tasklet_schedule(>finish_tasklet);
+   WARN_ON(1);
+   }
}
 
sdhci_send_command(host, data->stop);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH] mmc: host: sdhci: prevent mmcqd from becoming locked on mmc timeout

2013-11-13 Thread Neal Buckendahl
fixed a condition where device issues a status cmd to sdcard but no response
comes from sdcard. The sdhci irq fires and we hit a timeout case which calls
sdhci_finish_data(). sdhci_finish_data eventually attempt to reset controller
and issues stop cmd. However mmcdq is wait_for_completion(mrq-completion)
in function mmc_wait_for_req_done which never occurs.

Signed-off-by: Neal Buckendahl nealb...@gmail.com
Signed-off-by: Narayanan Gopalakrishnan narayan.1...@gmail.com
Signed-off-by: Philip Rakity prak...@nvidia.com
---
 drivers/mmc/host/sdhci.c |5 +
 1 file changed, 5 insertions(+)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 6785fb1..21620d2 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -973,6 +973,11 @@ static void sdhci_finish_data(struct sdhci_host *host)
if (data-error) {
sdhci_reset(host, SDHCI_RESET_CMD);
sdhci_reset(host, SDHCI_RESET_DATA);
+   if (data-error == -ETIMEDOUT) {
+   host-mrq-cmd-error = -ETIMEDOUT;
+   tasklet_schedule(host-finish_tasklet);
+   WARN_ON(1);
+   }
}
 
sdhci_send_command(host, data-stop);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH] mmc: host: sdhci: prevent mmcqd from becoming locked on mmc timeout

2013-11-09 Thread Neal Buckendahl
fixed a condition where device issues a status cmd to sdcard but no response
comes from sdcard. The sdhci irq fires and we hit a timeout case which calls
sdhci_finish_data(). sdhci_finish_data eventually attempt to reset controller
and issues stop cmd. However mmcdq is wait_for_completion(>completion)
in function mmc_wait_for_req_done which never occurs.

Signed-off-by: Neal Buckendahl 
---
 drivers/mmc/host/sdhci.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 6785fb1..480730f 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -973,6 +973,8 @@ static void sdhci_finish_data(struct sdhci_host *host)
if (data->error) {
sdhci_reset(host, SDHCI_RESET_CMD);
sdhci_reset(host, SDHCI_RESET_DATA);
+   host->mrq->cmd->error = -ETIMEDOUT;
+   tasklet_schedule(>finish_tasklet);
}
 
sdhci_send_command(host, data->stop);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH] mmc: host: sdhci: prevent mmcqd from becoming locked on mmc timeout

2013-11-09 Thread Neal Buckendahl
fixed a condition where device issues a status cmd to sdcard but no response
comes from sdcard. The sdhci irq fires and we hit a timeout case which calls
sdhci_finish_data(). sdhci_finish_data eventually attempt to reset controller
and issues stop cmd. However mmcdq is wait_for_completion(mrq-completion)
in function mmc_wait_for_req_done which never occurs.

Signed-off-by: Neal Buckendahl nealb...@gmail.com
---
 drivers/mmc/host/sdhci.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 6785fb1..480730f 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -973,6 +973,8 @@ static void sdhci_finish_data(struct sdhci_host *host)
if (data-error) {
sdhci_reset(host, SDHCI_RESET_CMD);
sdhci_reset(host, SDHCI_RESET_DATA);
+   host-mrq-cmd-error = -ETIMEDOUT;
+   tasklet_schedule(host-finish_tasklet);
}
 
sdhci_send_command(host, data-stop);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/