brcmfmac: defer DPC processing during probe

The sdio dpc starts processing when in SDIOD_STATE_DATA. This state was
entered right after firmware download. This patch moves that transition
just before enabling sdio interrupt handling thus avoiding watchdog
expiry which would put the bus to sleep while probing.

Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: Franky Lin <franky.lin@broadcom.com>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 5fb8b91b9326..68ab3ac15650 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -3305,10 +3305,6 @@ static int brcmf_sdio_download_firmware(struct brcmf_sdio *bus,
                 goto err;
         }
 
-        /* Allow full data communication using DPC from now on. */
-        brcmf_sdiod_change_state(bus->sdiodev, BRCMF_SDIOD_DATA);
-        bcmerror = 0;
-
 err:
         brcmf_sdio_clkctl(bus, CLK_SDONLY, false);
         sdio_release_host(bus->sdiodev->func[1]);
@@ -4046,6 +4042,9 @@ static void brcmf_sdio_firmware_callback(struct device *dev,
         }
 
         if (err == 0) {
+                /* Allow full data communication using DPC from now on. */
+                brcmf_sdiod_change_state(bus->sdiodev, BRCMF_SDIOD_DATA);
+
                 err = brcmf_sdiod_intr_register(sdiodev);
                 if (err != 0)
                         brcmf_err("intr register failed:%d\n", err);