package/kernel/mac80211/patches/323-v4.13-0004-brcmfmac-initialize-oob-irq-data-before-request_irq.patch

   1 From 3f426c96895556bb49adfa52f3aeafdedb2d02e7 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <mirq-linux@rere.qmqm.pl>
   3 Date: Tue, 13 Jun 2017 18:02:03 +0200
   4 Subject: [PATCH] brcmfmac: initialize oob irq data before request_irq()
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 This fixes spin-forever in irq handler when IRQ is already asserted
  10 at request_irq() time.
  11
  12 Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
  13 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  14 ---
  15  drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 8 +++-----
  16  1 file changed, 3 insertions(+), 5 deletions(-)
  17
  18 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
  19 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
  20 @@ -107,12 +107,14 @@ int brcmf_sdiod_intr_register(struct brc
  21         int ret = 0;
  22         u8 data;
  23         u32 addr, gpiocontrol;
  24 -       unsigned long flags;
  25
  26         pdata = &sdiodev->settings->bus.sdio;
  27         if (pdata->oob_irq_supported) {
  28                 brcmf_dbg(SDIO, "Enter, register OOB IRQ %d\n",
  29                           pdata->oob_irq_nr);
  30 +               spin_lock_init(&sdiodev->irq_en_lock);
  31 +               sdiodev->irq_en = true;
  32 +
  33                 ret = request_irq(pdata->oob_irq_nr, brcmf_sdiod_oob_irqhandler,
  34                                   pdata->oob_irq_flags, "brcmf_oob_intr",
  35                                   &sdiodev->func[1]->dev);
  36 @@ -121,10 +123,6 @@ int brcmf_sdiod_intr_register(struct brc
  37                         return ret;
  38                 }
  39                 sdiodev->oob_irq_requested = true;
  40 -               spin_lock_init(&sdiodev->irq_en_lock);
  41 -               spin_lock_irqsave(&sdiodev->irq_en_lock, flags);
  42 -               sdiodev->irq_en = true;
  43 -               spin_unlock_irqrestore(&sdiodev->irq_en_lock, flags);
  44
  45                 ret = enable_irq_wake(pdata->oob_irq_nr);
  46                 if (ret != 0) {