This is a note to let you know that I've just added the patch titled rsi: Use resume_noirq for SDIO to the 4.19-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: rsi-use-resume_noirq-for-sdio.patch and it can be found in the queue-4.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From c434e5e48dc4e626364491455f97e2db0aa137b1 Mon Sep 17 00:00:00 2001 From: Marek Vasut <marex@xxxxxxx> Date: Sun, 28 Mar 2021 00:59:32 +0100 Subject: rsi: Use resume_noirq for SDIO From: Marek Vasut <marex@xxxxxxx> commit c434e5e48dc4e626364491455f97e2db0aa137b1 upstream. 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@xxxxxxx> Cc: Amitkumar Karwar <amit.karwar@xxxxxxxxxxxxxxxxxx> Cc: Angus Ainslie <angus@xxxxxxxx> Cc: David S. Miller <davem@xxxxxxxxxxxxx> Cc: Jakub Kicinski <kuba@xxxxxxxxxx> Cc: Kalle Valo <kvalo@xxxxxxxxxxxxxx> Cc: Karun Eagalapati <karun256@xxxxxxxxx> Cc: Martin Kepplinger <martink@xxxxxxxxx> Cc: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@xxxxxxx> Cc: Siva Rebbagondla <siva8118@xxxxxxxxx> Cc: netdev@xxxxxxxxxxxxxxx Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20210327235932.175896-1-marex@xxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/net/wireless/rsi/rsi_91x_sdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/wireless/rsi/rsi_91x_sdio.c +++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c @@ -1400,7 +1400,7 @@ static int rsi_restore(struct device *de } 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, Patches currently in stable-queue which might be from marex@xxxxxxx are queue-4.19/rsi-use-resume_noirq-for-sdio.patch