package/kernel/mac80211/patches/351-0004-brcmfmac-Fix-did-not-remove-int-handler-warning.patch

   1 From: Christian Daudt <csd@broadcom.com>
   2 Date: Wed, 11 May 2016 15:06:49 -0700
   3 Subject: [PATCH] brcmfmac: Fix 'did not remove int handler' warning
   4
   5 brcmf_sdiod_intr_unregister call that removes both func1 and
   6 func2 interrupt handlers only called when brcmf_ops_sdio_remove
   7 is called for func 1 (which is the 2nd call) but sdio is expecting
   8 it to be removed at the end of each sdio_remove call.
   9 This is causing 'rmmod bcmrfmac' on a 4356-sdio chip to complain
  10 with:
  11 WARNING: driver brcmfmac did not remove its interrupt handler!
  12
  13 The modification makes calling brcmf_sdiod_intr_unregister multiple
  14 times harmless by clearing the variables that track if interrupt
  15 handlers have been installed, and then calls it on every
  16 brcmf_ops_sdio_remove call instead of just remove for func 1.
  17
  18 Signed-off-by: Christian Daudt <csd@broadcom.com>
  19 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  20 ---
  21
  22 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
  23 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
  24 @@ -172,7 +172,7 @@ int brcmf_sdiod_intr_register(struct brc
  25         return 0;
  26  }
  27
  28 -int brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev)
  29 +void brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev)
  30  {
  31
  32         brcmf_dbg(SDIO, "Entering oob=%d sd=%d\n",
  33 @@ -195,6 +195,7 @@ int brcmf_sdiod_intr_unregister(struct b
  34                 }
  35                 free_irq(pdata->oob_irq_nr, &sdiodev->func[1]->dev);
  36                 sdiodev->irq_en = false;
  37 +               sdiodev->oob_irq_requested = false;
  38         }
  39
  40         if (sdiodev->sd_irq_requested) {
  41 @@ -202,9 +203,8 @@ int brcmf_sdiod_intr_unregister(struct b
  42                 sdio_release_irq(sdiodev->func[2]);
  43                 sdio_release_irq(sdiodev->func[1]);
  44                 sdio_release_host(sdiodev->func[1]);
  45 +               sdiodev->sd_irq_requested = false;
  46         }
  47 -
  48 -       return 0;
  49  }
  50
  51  void brcmf_sdiod_change_state(struct brcmf_sdio_dev *sdiodev,
  52 @@ -1200,12 +1200,17 @@ static void brcmf_ops_sdio_remove(struct
  53         brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device);
  54         brcmf_dbg(SDIO, "Function: %d\n", func->num);
  55
  56 -       if (func->num != 1)
  57 -               return;
  58 -
  59         bus_if = dev_get_drvdata(&func->dev);
  60         if (bus_if) {
  61                 sdiodev = bus_if->bus_priv.sdio;
  62 +
  63 +               /* start by unregistering irqs */
  64 +               brcmf_sdiod_intr_unregister(sdiodev);
  65 +
  66 +               if (func->num != 1)
  67 +                       return;
  68 +
  69 +               /* only proceed with rest of cleanup if func 1 */
  70                 brcmf_sdiod_remove(sdiodev);
  71
  72                 dev_set_drvdata(&sdiodev->func[1]->dev, NULL);
  73 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
  74 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
  75 @@ -294,7 +294,7 @@ struct sdpcmd_regs {
  76
  77  /* Register/deregister interrupt handler. */
  78  int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev);
  79 -int brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev);
  80 +void brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev);
  81
  82  /* sdio device register access interface */
  83  u8 brcmf_sdiod_regrb(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret);