]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
rsi: Use resume_noirq for SDIO
authorMarek Vasut <marex@denx.de>
Sat, 27 Mar 2021 23:59:32 +0000 (00:59 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Sun, 18 Apr 2021 06:31:50 +0000 (09:31 +0300)
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 <marex@denx.de>
Cc: Amitkumar Karwar <amit.karwar@redpinesignals.com>
Cc: Angus Ainslie <angus@akkea.ca>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: Karun Eagalapati <karun256@gmail.com>
Cc: Martin Kepplinger <martink@posteo.de>
Cc: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
Cc: Siva Rebbagondla <siva8118@gmail.com>
Cc: netdev@vger.kernel.org
Cc: stable@vger.kernel.org
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210327235932.175896-1-marex@denx.de
drivers/net/wireless/rsi/rsi_91x_sdio.c

index fe0287b22a25454c3d28f8d47a808e3ee90569c0..e0c502bc427074d9b94ea875e89a5109fbabb38f 100644 (file)
@@ -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,