* [PATCH] Revert "mmc: bcm2835: Terminate timeout work synchronously"
@ 2019-09-08 7:45 Stefan Wahren
2019-09-08 10:32 ` Ulf Hansson
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Wahren @ 2019-09-08 7:45 UTC (permalink / raw)
To: Ulf Hansson, Eric Anholt, Florian Fainelli, Ray Jui,
Scott Branden, Lukas Wunner
Cc: stable, linux-mmc, Stefan Wahren, linux-arm-kernel
The commit 37fefadee8bb ("mmc: bcm2835: Terminate timeout work
synchronously") causes lockups in case of hardware timeouts due the
timeout work also calling cancel_delayed_work_sync() on its own.
So revert it.
Fixes: 37fefadee8bb ("mmc: bcm2835: Terminate timeout work synchronously")
Cc: stable@vger.kernel.org
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
drivers/mmc/host/bcm2835.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
index 7e0d3a4..bb31e13 100644
--- a/drivers/mmc/host/bcm2835.c
+++ b/drivers/mmc/host/bcm2835.c
@@ -597,7 +597,7 @@ static void bcm2835_finish_request(struct bcm2835_host *host)
struct dma_chan *terminate_chan = NULL;
struct mmc_request *mrq;
- cancel_delayed_work_sync(&host->timeout_work);
+ cancel_delayed_work(&host->timeout_work);
mrq = host->mrq;
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Revert "mmc: bcm2835: Terminate timeout work synchronously"
2019-09-08 7:45 [PATCH] Revert "mmc: bcm2835: Terminate timeout work synchronously" Stefan Wahren
@ 2019-09-08 10:32 ` Ulf Hansson
0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2019-09-08 10:32 UTC (permalink / raw)
To: Stefan Wahren
Cc: Florian Fainelli, Scott Branden, Ray Jui,
linux-mmc@vger.kernel.org, # 4.0+, Eric Anholt, Lukas Wunner,
Linux ARM
On Sun, 8 Sep 2019 at 09:46, Stefan Wahren <wahrenst@gmx.net> wrote:
>
> The commit 37fefadee8bb ("mmc: bcm2835: Terminate timeout work
> synchronously") causes lockups in case of hardware timeouts due the
> timeout work also calling cancel_delayed_work_sync() on its own.
> So revert it.
>
> Fixes: 37fefadee8bb ("mmc: bcm2835: Terminate timeout work synchronously")
> Cc: stable@vger.kernel.org
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Applied for fixes, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/bcm2835.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c
> index 7e0d3a4..bb31e13 100644
> --- a/drivers/mmc/host/bcm2835.c
> +++ b/drivers/mmc/host/bcm2835.c
> @@ -597,7 +597,7 @@ static void bcm2835_finish_request(struct bcm2835_host *host)
> struct dma_chan *terminate_chan = NULL;
> struct mmc_request *mrq;
>
> - cancel_delayed_work_sync(&host->timeout_work);
> + cancel_delayed_work(&host->timeout_work);
>
> mrq = host->mrq;
>
> --
> 2.7.4
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-08 10:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-08 7:45 [PATCH] Revert "mmc: bcm2835: Terminate timeout work synchronously" Stefan Wahren
2019-09-08 10:32 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox