brcmfmac: simplify sdio code download routine. (f9951c13) · Commits · 戴 / test

brcmf_sdio_download_code_file is using a loop to send small blobs of data. This is unnecessarily complex and was simplified with this patch. Reviewed-by:

Arend Van Spriel <arend@broadcom.com> Reviewed-by:

Franky (Zhenhui) Lin <frankyl@broadcom.com> Reviewed-by:

Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by:

Daniel (Deognyoun) Kim <dekim@broadcom.com> Signed-off-by:

Hante Meuleman <meuleman@broadcom.com> Signed-off-by:

Arend van Spriel <arend@broadcom.com> Signed-off-by:

John W. Linville <linville@tuxdriver.com>

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

+8 −23

Original line number	Diff line number	Diff line
		@@ -3291,30 +3291,15 @@ static int brcmf_sdio_download_code_file(struct brcmf_sdio *bus,
		const struct firmware *fw)
		{
		int err;
		int offset;
		int address;
		int len;

		brcmf_dbg(TRACE, "Enter\n");

		err = 0;
		offset = 0;
		address = bus->ci->rambase;
		while (offset < fw->size) {
		len = ((offset + MEMBLOCK) < fw->size) ? MEMBLOCK :
		fw->size - offset;
		err = brcmf_sdiod_ramrw(bus->sdiodev, true, address,
		(u8 *)&fw->data[offset], len);
		if (err) {
		err = brcmf_sdiod_ramrw(bus->sdiodev, true, bus->ci->rambase,
		(u8 *)fw->data, fw->size);
		if (err)
		brcmf_err("error %d on writing %d membytes at 0x%08x\n",
		err, len, address);
		return err;
		}
		offset += len;
		address += len;
		}
		if (!err)
		if (!brcmf_sdio_verifymemory(bus->sdiodev, bus->ci->rambase,
		err, (int)fw->size, bus->ci->rambase);
		else if (!brcmf_sdio_verifymemory(bus->sdiodev, bus->ci->rambase,
		(u8 *)fw->data, fw->size))
		err = -EIO;

Admin message