package/kernel/mac80211/patches/351-0028-brcmfmac-defer-DPC-processing-during-probe.patch

   1 From fd3ed33f51c2a586412d35b4f64803f019ab589f Mon Sep 17 00:00:00 2001
   2 From: Arend Van Spriel <arend.vanspriel@broadcom.com>
   3 Date: Fri, 15 Jul 2016 12:39:13 +0200
   4 Subject: [PATCH] brcmfmac: defer DPC processing during probe
   5
   6 The sdio dpc starts processing when in SDIOD_STATE_DATA. This state was
   7 entered right after firmware download. This patch moves that transition
   8 just before enabling sdio interrupt handling thus avoiding watchdog
   9 expiry which would put the bus to sleep while probing.
  10
  11 Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
  12 Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
  13 Reviewed-by: Franky Lin <franky.lin@broadcom.com>
  14 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  15 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  16 ---
  17  drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 7 +++----
  18  1 file changed, 3 insertions(+), 4 deletions(-)
  19
  20 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
  21 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
  22 @@ -3304,10 +3304,6 @@ static int brcmf_sdio_download_firmware(
  23                 goto err;
  24         }
  25
  26 -       /* Allow full data communication using DPC from now on. */
  27 -       brcmf_sdiod_change_state(bus->sdiodev, BRCMF_SDIOD_DATA);
  28 -       bcmerror = 0;
  29 -
  30  err:
  31         brcmf_sdio_clkctl(bus, CLK_SDONLY, false);
  32         sdio_release_host(bus->sdiodev->func[1]);
  33 @@ -4045,6 +4041,9 @@ static void brcmf_sdio_firmware_callback
  34         }
  35
  36         if (err == 0) {
  37 +               /* Allow full data communication using DPC from now on. */
  38 +               brcmf_sdiod_change_state(bus->sdiodev, BRCMF_SDIOD_DATA);
  39 +
  40                 err = brcmf_sdiod_intr_register(sdiodev);
  41                 if (err != 0)
  42                         brcmf_err("intr register failed:%d\n", err);