2021-03-28 00:12:12

by Marek Vasut

Subject: [PATCH] rsi: Use resume_noirq for SDIO

The rsi_resume() does access the bus to enable interrupts on the RSI
SDIO WiFi card, however when calling sdio_claim_host() in the resume
path, it is possible the bus is already claimed and sdio_claim_host()
spins indefinitelly. Enable the SDIO card interrupts in resume_noirq
instead to prevent anything else from claiming the SDIO bus first.

Fixes: 20db07332736 ("rsi: sdio suspend and resume support")
Signed-off-by: Marek Vasut <[email protected]>
Cc: Amitkumar Karwar <[email protected]>
Cc: Angus Ainslie <[email protected]>
Cc: David S. Miller <[email protected]>
Cc: Jakub Kicinski <[email protected]>
Cc: Kalle Valo <[email protected]>
Cc: Karun Eagalapati <[email protected]>
Cc: Martin Kepplinger <[email protected]>
Cc: Sebastian Krzyszkowiak <[email protected]>
Cc: Siva Rebbagondla <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
drivers/net/wireless/rsi/rsi_91x_sdio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c
index 122174fca672..8465a4ee9b61 100644
--- a/drivers/net/wireless/rsi/rsi_91x_sdio.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c
@@ -1513,7 +1513,7 @@ static int rsi_restore(struct device *dev)
}
static const struct dev_pm_ops rsi_pm_ops = {
.suspend = rsi_suspend,
- .resume = rsi_resume,
+ .resume_noirq = rsi_resume,
.freeze = rsi_freeze,
.thaw = rsi_thaw,
.restore = rsi_restore,
--
2.30.2

2021-04-18 06:34:32

by Kalle Valo

Subject: Re: [PATCH] rsi: Use resume_noirq for SDIO

Marek Vasut <[email protected]> wrote:

> The rsi_resume() does access the bus to enable interrupts on the RSI
> SDIO WiFi card, however when calling sdio_claim_host() in the resume
> path, it is possible the bus is already claimed and sdio_claim_host()
> spins indefinitelly. Enable the SDIO card interrupts in resume_noirq
> instead to prevent anything else from claiming the SDIO bus first.
>
> Fixes: 20db07332736 ("rsi: sdio suspend and resume support")
> Signed-off-by: Marek Vasut <[email protected]>
> Cc: Amitkumar Karwar <[email protected]>
> Cc: Angus Ainslie <[email protected]>
> Cc: David S. Miller <[email protected]>
> Cc: Jakub Kicinski <[email protected]>
> Cc: Kalle Valo <[email protected]>
> Cc: Karun Eagalapati <[email protected]>
> Cc: Martin Kepplinger <[email protected]>
> Cc: Sebastian Krzyszkowiak <[email protected]>
> Cc: Siva Rebbagondla <[email protected]>
> Cc: [email protected]
> Cc: [email protected]

Patch applied to wireless-drivers-next.git, thanks.

c434e5e48dc4 rsi: Use resume_noirq for SDIO

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches