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

Commit 7f9a8dc8 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: rework scatter-gather code in brcmf_sdio_buffrw() 



Moving a number of assignments outside of the loop as they are
the same for each request.

Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
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 avatarJohn W. Linville <linville@tuxdriver.com>
parent 71201496

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

+19 −15
Original line number Diff line number Diff line
@@ -409,12 +409,26 @@ static int brcmf_sdio_buffrw(struct brcmf_sdio_dev *sdiodev, uint fn, 
		goto exit;

	}



	while (seg_sz) {

		req_sz = 0;

		sg_cnt = 0;

	memset(&mmc_req, 0, sizeof(struct mmc_request));

	memset(&mmc_cmd, 0, sizeof(struct mmc_command));

	memset(&mmc_dat, 0, sizeof(struct mmc_data));



	mmc_dat.sg = st.sgl;

	mmc_dat.blksz = func_blk_sz;

	mmc_dat.flags = write ? MMC_DATA_WRITE : MMC_DATA_READ;

	mmc_cmd.opcode = SD_IO_RW_EXTENDED;

	mmc_cmd.arg = write ? 1<<31 : 0;	/* write flag  */

	mmc_cmd.arg |= (fn & 0x7) << 28;	/* SDIO func num */

	mmc_cmd.arg |= 1<<27;			/* block mode */

	/* for function 1 the addr will be incremented */

	mmc_cmd.arg |= (fn == 1) ? 1<<26 : 0;

	mmc_cmd.flags = MMC_RSP_SPI_R5 | MMC_RSP_R5 | MMC_CMD_ADTC;

	mmc_req.cmd = &mmc_cmd;

	mmc_req.data = &mmc_dat;



	while (seg_sz) {

		req_sz = 0;

		sg_cnt = 0;

		sgl = st.sgl;

		/* prep sg table */

		while (pkt_next != (struct sk_buff *)target_list) {
@@ -447,22 +461,12 @@ static int brcmf_sdio_buffrw(struct brcmf_sdio_dev *sdiodev, uint fn, 
			ret = -ENOTBLK;

			goto exit;

		}

		mmc_dat.sg = st.sgl;



		mmc_dat.sg_len = sg_cnt;

		mmc_dat.blksz = func_blk_sz;

		mmc_dat.blocks = req_sz / func_blk_sz;

		mmc_dat.flags = write ? MMC_DATA_WRITE : MMC_DATA_READ;

		mmc_cmd.opcode = SD_IO_RW_EXTENDED;

		mmc_cmd.arg = write ? 1<<31 : 0;	/* write flag  */

		mmc_cmd.arg |= (fn & 0x7) << 28;	/* SDIO func num */

		mmc_cmd.arg |= 1<<27;			/* block mode */

		/* incrementing addr for function 1 */

		mmc_cmd.arg |= (fn == 1) ? 1<<26 : 0;

		mmc_cmd.arg |= (addr & 0x1FFFF) << 9;	/* address */

		mmc_cmd.arg |= mmc_dat.blocks & 0x1FF;	/* block count */

		mmc_cmd.flags = MMC_RSP_SPI_R5 | MMC_RSP_R5 | MMC_CMD_ADTC;

		mmc_req.cmd = &mmc_cmd;

		mmc_req.data = &mmc_dat;

		/* incrementing addr for function 1 */

		if (fn == 1)

			addr += req_sz;