package/kernel/mac80211/patches/342-brcmfmac-assure-device-is-ready-for-download-after-b.patch

   1 From: Arend van Spriel <arend@broadcom.com>
   2 Date: Wed, 11 Mar 2015 16:11:30 +0100
   3 Subject: [PATCH] brcmfmac: assure device is ready for download after
   4  brcmf_chip_attach()
   5
   6 Make the brcmf_chip_attach() function responsible for putting the
   7 device in a state where it is accessible for firmware download.
   8
   9 Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
  10 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
  11 Signed-off-by: Arend van Spriel <arend@broadcom.com>
  12 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  13 ---
  14
  15 --- a/drivers/net/wireless/brcm80211/brcmfmac/chip.c
  16 +++ b/drivers/net/wireless/brcm80211/brcmfmac/chip.c
  17 @@ -786,12 +786,6 @@ static int brcmf_chip_setup(struct brcmf
  18         if (chip->ops->setup)
  19                 ret = chip->ops->setup(chip->ctx, pub);
  20
  21 -       /*
  22 -        * Make sure any on-chip ARM is off (in case strapping is wrong),
  23 -        * or downloaded code was already running.
  24 -        */
  25 -       brcmf_chip_disable_arm(chip, BCMA_CORE_ARM_CM3);
  26 -       brcmf_chip_disable_arm(chip, BCMA_CORE_ARM_CR4);
  27         return ret;
  28  }
  29
  30 @@ -833,6 +827,8 @@ struct brcmf_chip *brcmf_chip_attach(voi
  31         if (err < 0)
  32                 goto fail;
  33
  34 +       /* assure chip is passive for download */
  35 +       brcmf_chip_set_passive(&chip->pub);
  36         return &chip->pub;
  37
  38  fail:
  39 --- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
  40 +++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
  41 @@ -509,8 +509,6 @@ static void brcmf_pcie_attach(struct brc
  42
  43  static int brcmf_pcie_enter_download_state(struct brcmf_pciedev_info *devinfo)
  44  {
  45 -       brcmf_chip_set_passive(devinfo->ci);
  46 -
  47         if (devinfo->ci->chip == BRCM_CC_43602_CHIP_ID) {
  48                 brcmf_pcie_select_core(devinfo, BCMA_CORE_ARM_CR4);
  49                 brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_ARMCR4REG_BANKIDX,
  50 --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
  51 +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
  52 @@ -3356,9 +3356,6 @@ static int brcmf_sdio_download_firmware(
  53         sdio_claim_host(bus->sdiodev->func[1]);
  54         brcmf_sdio_clkctl(bus, CLK_AVAIL, false);
  55
  56 -       /* Keep arm in reset */
  57 -       brcmf_chip_set_passive(bus->ci);
  58 -
  59         rstvec = get_unaligned_le32(fw->data);
  60         brcmf_dbg(SDIO, "firmware rstvec: %x\n", rstvec);
  61