On 17/08/16 00:25, [email protected] wrote: > From: Christopher Freeman <[email protected]> > > 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 <[email protected]> > Tested-by: Robert Foss <[email protected]> > Signed-off-by: Robert Foss <[email protected]> > Reviewed-by: Benson Leung <[email protected]>
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 <[email protected]> > --- > 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); >
