* [PACTH v2] mmc: sdhci: Do not allow tuning procedure to be interrupted
@ 2016-07-28 18:07 robert.foss
0 siblings, 0 replies; 3+ messages in thread
From: robert.foss @ 2016-07-28 18:07 UTC (permalink / raw)
To: adrian.hunter, ulf.hansson, linux-mmc, linux-kernel
Cc: Christopher Freeman, Robert Foss
From: Christopher Freeman <cfreeman@nvidia.com>
wait_event_interruptible_timeout() will return early if the blocked
process receives a signal, causing the driver to abort the tuning
procedure and possibly leaving the controller in a bad state. Since the
tuning command is expected to complete quickly (<50ms) and we've set a
timeout, use wait_event_timeout() instead.
Signed-off-by: Christopher Freeman <cfreeman@nvidia.com>
Tested-by: Robert Foss <robert.foss@collabora.com>
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
drivers/mmc/host/sdhci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 0e3d7c0..9e80203 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1960,7 +1960,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
spin_unlock_irqrestore(&host->lock, flags);
/* Wait for Buffer Read Ready interrupt */
- wait_event_interruptible_timeout(host->buf_ready_int,
+ wait_event_timeout(host->buf_ready_int,
(host->tuning_done == 1),
msecs_to_jiffies(50));
spin_lock_irqsave(&host->lock, flags);
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PACTH v2] mmc: sdhci: Do not allow tuning procedure to be interrupted
2016-08-08 16:11 robert.foss
@ 2016-08-08 16:16 ` Benson Leung
0 siblings, 0 replies; 3+ messages in thread
From: Benson Leung @ 2016-08-08 16:16 UTC (permalink / raw)
To: robert.foss
Cc: adrian.hunter, ulf.hansson, linux-mmc, linux-kernel,
Andrew Bresticker, Kevin Cernekee, Christopher Freeman
On Mon, Aug 8, 2016 at 9:11 AM, <robert.foss@collabora.com> wrote:
>
> From: Christopher Freeman <cfreeman@nvidia.com>
>
> wait_event_interruptible_timeout() will return early if the blocked
> process receives a signal, causing the driver to abort the tuning
> procedure and possibly leaving the controller in a bad state. Since the
> tuning command is expected to complete quickly (<50ms) and we've set a
> timeout, use wait_event_timeout() instead.
>
> Signed-off-by: Christopher Freeman <cfreeman@nvidia.com>
> Tested-by: Robert Foss <robert.foss@collabora.com>
> Signed-off-by: Robert Foss <robert.foss@collabora.com>
Reviewed-by: Benson Leung <bleung@chromium.org>
Thanks Robert!
--
Benson Leung
Senior Software Engineer, Chrom* OS
bleung@chromium.org
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PACTH v2] mmc: sdhci: Do not allow tuning procedure to be interrupted
@ 2016-08-08 16:11 robert.foss
2016-08-08 16:16 ` Benson Leung
0 siblings, 1 reply; 3+ messages in thread
From: robert.foss @ 2016-08-08 16:11 UTC (permalink / raw)
To: adrian.hunter, ulf.hansson, linux-mmc, linux-kernel,
Andrew Bresticker, Kevin Cernekee, Benson Leung
Cc: Christopher Freeman, Robert Foss
From: Christopher Freeman <cfreeman@nvidia.com>
wait_event_interruptible_timeout() will return early if the blocked
process receives a signal, causing the driver to abort the tuning
procedure and possibly leaving the controller in a bad state. Since the
tuning command is expected to complete quickly (<50ms) and we've set a
timeout, use wait_event_timeout() instead.
Signed-off-by: Christopher Freeman <cfreeman@nvidia.com>
Tested-by: Robert Foss <robert.foss@collabora.com>
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
This is a resubmission of v2 of this patch.
drivers/mmc/host/sdhci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 0e3d7c0..9e80203 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1960,7 +1960,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
spin_unlock_irqrestore(&host->lock, flags);
/* Wait for Buffer Read Ready interrupt */
- wait_event_interruptible_timeout(host->buf_ready_int,
+ wait_event_timeout(host->buf_ready_int,
(host->tuning_done == 1),
msecs_to_jiffies(50));
spin_lock_irqsave(&host->lock, flags);
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-08-08 16:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-28 18:07 [PACTH v2] mmc: sdhci: Do not allow tuning procedure to be interrupted robert.foss
2016-08-08 16:11 robert.foss
2016-08-08 16:16 ` Benson Leung
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).