evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Arend van Spriel 2015-03-11 16:11:30 +01:00 • committed by Kalle Valo
parent d380ebc9b6
commit 38f29e1f42
3 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/wireless/brcm80211/brcmfmac/chip.c
View file

@ -786,12 +786,6 @@ static int brcmf_chip_setup(struct brcmf_chip_priv *chip)
if (chip->ops->setup) if (chip->ops->setup)
ret = chip->ops->setup(chip->ctx, pub); 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; return ret;
} }
@ -833,6 +827,8 @@ struct brcmf_chip *brcmf_chip_attach(void *ctx,
if (err < 0) if (err < 0)
goto fail; goto fail;
/* assure chip is passive for download */
brcmf_chip_set_passive(&chip->pub);
return &chip->pub; return &chip->pub;
fail: fail:

2
drivers/net/wireless/brcm80211/brcmfmac/pcie.c
View file

@ -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) 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) { if (devinfo->ci->chip == BRCM_CC_43602_CHIP_ID) {
brcmf_pcie_select_core(devinfo, BCMA_CORE_ARM_CR4); brcmf_pcie_select_core(devinfo, BCMA_CORE_ARM_CR4);
brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_ARMCR4REG_BANKIDX, brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_ARMCR4REG_BANKIDX,

3
drivers/net/wireless/brcm80211/brcmfmac/sdio.c
View file

@ -3356,9 +3356,6 @@ static int brcmf_sdio_download_firmware(struct brcmf_sdio *bus,
sdio_claim_host(bus->sdiodev->func[1]); sdio_claim_host(bus->sdiodev->func[1]);
brcmf_sdio_clkctl(bus, CLK_AVAIL, false); brcmf_sdio_clkctl(bus, CLK_AVAIL, false);
/* Keep arm in reset */
brcmf_chip_set_passive(bus->ci);
rstvec = get_unaligned_le32(fw->data); rstvec = get_unaligned_le32(fw->data);
brcmf_dbg(SDIO, "firmware rstvec: %x\n", rstvec); brcmf_dbg(SDIO, "firmware rstvec: %x\n", rstvec);