Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38f29e1f authored by Arend van Spriel's avatar Arend van Spriel Committed by Kalle Valo
Browse files

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: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d380ebc9

drivers/net/wireless/brcm80211/brcmfmac/chip.c

+2 −6
Original line number Diff line number Diff line
@@ -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:

drivers/net/wireless/brcm80211/brcmfmac/pcie.c

+0 −2
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/brcm80211/brcmfmac/sdio.c

+0 −3
Original line number Diff line number Diff line
@@ -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);