62 lines
2 KiB
Diff
62 lines
2 KiB
Diff
|
From: Arend van Spriel <arend@broadcom.com>
|
||
|
|
Date: Wed, 11 Mar 2015 16:11:30 +0100
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
---
|
||
|
|
|
||
|
|
--- 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
|
||
|
|
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(voi
|
||
|
|
if (err < 0)
|
||
|
|
goto fail;
|
||
|
|
|
||
|
|
+ /* assure chip is passive for download */
|
||
|
|
+ brcmf_chip_set_passive(&chip->pub);
|
||
|
|
return &chip->pub;
|
||
|
|
|
||
|
|
fail:
|
||
|
|
--- 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 brc
|
||
|
|
|
||
|
|
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,
|
||
|
|
--- 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(
|
||
|
|
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);
|
||
|
|
|