Re: [PACTH v3] mmc: sdhci: Do not allow tuning procedure to be interrupted

Adrian Hunter
2016-08-17T10:52:03Z

On 17/08/16 00:25, 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>

The mmc block queues are kernel threads which I would expect ignore signals,
so I am curious how you hit this?

In any case:

Acked-by: Adrian Hunter <adrian.hunter@intel.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);
>