brcmfmac: assure device is ready for download after brcmf_chip_attach()

Make the brcmf_chip_attach() function responsible for putting the
device in a state where it is accessible for firmware download.

Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/brcm80211/brcmfmac/chip.c
index d68e37d3a42fac468945e69d96572c0fc41cfb36..c11137e290b13b8f7524710929268b359e388b2b 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/chip.c
@@ -786,12 +786,6 @@ static int brcmf_chip_setup(struct brcmf_chip_priv *chip)
        if (chip->ops->setup)
                ret = chip->ops->setup(chip->ctx, pub);
 
-       /*
-        * Make sure any on-chip ARM is off (in case strapping is wrong),
-        * or downloaded code was already running.
-        */
-       brcmf_chip_disable_arm(chip, BCMA_CORE_ARM_CM3);
-       brcmf_chip_disable_arm(chip, BCMA_CORE_ARM_CR4);
        return ret;
 }
 
@@ -833,6 +827,8 @@ struct brcmf_chip *brcmf_chip_attach(void *ctx,
        if (err < 0)
                goto fail;
 
+       /* assure chip is passive for download */
+       brcmf_chip_set_passive(&chip->pub);
        return &chip->pub;
 
 fail:

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
index 81e544f2f2fe1f5a529bcf5e85256b241cdd0cef..aa7a4dfb8beb77ed82c1cce09514cfa556b8fe64 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
@@ -509,8 +509,6 @@ static void brcmf_pcie_attach(struct brcmf_pciedev_info *devinfo)
 
 static int brcmf_pcie_enter_download_state(struct brcmf_pciedev_info *devinfo)
 {
-       brcmf_chip_set_passive(devinfo->ci);
-
        if (devinfo->ci->chip == BRCM_CC_43602_CHIP_ID) {
                brcmf_pcie_select_core(devinfo, BCMA_CORE_ARM_CR4);
                brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_ARMCR4REG_BANKIDX,

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
index fff3b26975fefb750c481a5126815af17d88e237..c783c25b9ee0c590b46e8c1301eee3dc161e6ab8 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
@@ -3356,9 +3356,6 @@ static int brcmf_sdio_download_firmware(struct brcmf_sdio *bus,
        sdio_claim_host(bus->sdiodev->func[1]);
        brcmf_sdio_clkctl(bus, CLK_AVAIL, false);
 
-       /* Keep arm in reset */
-       brcmf_chip_set_passive(bus->ci);
-
        rstvec = get_unaligned_le32(fw->data);
        brcmf_dbg(SDIO, "firmware rstvec: %x\n", rstvec);