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

Commit a322febe authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Ulf Hansson
Browse files

mmc: meson-gx: improve variable usage in meson_mmc_start_cmd 



Simplify the code by using two variables instead of a struct sd_emmc_desc.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 00412ddc

drivers/mmc/host/meson-gx-mmc.c

+24 −31
Original line number Diff line number Diff line
@@ -425,44 +425,38 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) 
{

	struct meson_host *host = mmc_priv(mmc);

	struct mmc_data *data = cmd->data;

	struct sd_emmc_desc *desc, desc_tmp;

	u32 cfg;

	u32 cfg, cmd_cfg = 0, cmd_data = 0;

	u8 blk_len, cmd_cfg_timeout;

	unsigned int xfer_bytes = 0;



	/* Setup descriptors */

	dma_rmb();

	desc = &desc_tmp;

	memset(desc, 0, sizeof(struct sd_emmc_desc));



	desc->cmd_cfg |= (cmd->opcode & CMD_CFG_CMD_INDEX_MASK)	<<

	cmd_cfg |= (cmd->opcode & CMD_CFG_CMD_INDEX_MASK) <<

		   CMD_CFG_CMD_INDEX_SHIFT;

	desc->cmd_cfg |= CMD_CFG_OWNER;  /* owned by CPU */

	desc->cmd_arg = cmd->arg;

	cmd_cfg |= CMD_CFG_OWNER;  /* owned by CPU */



	/* Response */

	if (cmd->flags & MMC_RSP_PRESENT) {

		if (cmd->flags & MMC_RSP_136)

			desc->cmd_cfg |= CMD_CFG_RESP_128;

		desc->cmd_cfg |= CMD_CFG_RESP_NUM;

		desc->cmd_resp = 0;

			cmd_cfg |= CMD_CFG_RESP_128;

		cmd_cfg |= CMD_CFG_RESP_NUM;



		if (!(cmd->flags & MMC_RSP_CRC))

			desc->cmd_cfg |= CMD_CFG_RESP_NOCRC;

			cmd_cfg |= CMD_CFG_RESP_NOCRC;



		if (cmd->flags & MMC_RSP_BUSY)

			desc->cmd_cfg |= CMD_CFG_R1B;

			cmd_cfg |= CMD_CFG_R1B;

	} else {

		desc->cmd_cfg |= CMD_CFG_NO_RESP;

		cmd_cfg |= CMD_CFG_NO_RESP;

	}



	/* data? */

	if (data) {

		desc->cmd_cfg |= CMD_CFG_DATA_IO;

		cmd_cfg |= CMD_CFG_DATA_IO;

		if (data->blocks > 1) {

			desc->cmd_cfg |= CMD_CFG_BLOCK_MODE;

			desc->cmd_cfg |=

				(data->blocks & CMD_CFG_LENGTH_MASK) <<

			cmd_cfg |= CMD_CFG_BLOCK_MODE;

			cmd_cfg |= (data->blocks & CMD_CFG_LENGTH_MASK) <<

				   CMD_CFG_LENGTH_SHIFT;



			/* check if block-size matches, if not update */
@@ -479,15 +473,14 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) 
				writel(cfg, host->regs + SD_EMMC_CFG);

			}

		} else {

			desc->cmd_cfg |=

				(data->blksz & CMD_CFG_LENGTH_MASK) <<

			cmd_cfg |= (data->blksz & CMD_CFG_LENGTH_MASK) <<

				   CMD_CFG_LENGTH_SHIFT;

		}



		data->bytes_xfered = 0;

		xfer_bytes = data->blksz * data->blocks;

		if (data->flags & MMC_DATA_WRITE) {

			desc->cmd_cfg |= CMD_CFG_DATA_WR;

			cmd_cfg |= CMD_CFG_DATA_WR;

			WARN_ON(xfer_bytes > host->bounce_buf_size);

			sg_copy_to_buffer(data->sg, data->sg_len,

					  host->bounce_buf, xfer_bytes);
@@ -495,24 +488,24 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) 
			dma_wmb();

		}



		desc->cmd_data = host->bounce_dma_addr & CMD_DATA_MASK;

		cmd_data = host->bounce_dma_addr & CMD_DATA_MASK;



		cmd_cfg_timeout = ilog2(SD_EMMC_CMD_TIMEOUT_DATA);

	} else {

		cmd_cfg_timeout = ilog2(SD_EMMC_CMD_TIMEOUT);

	}

	desc->cmd_cfg |= (cmd_cfg_timeout & CMD_CFG_TIMEOUT_MASK) <<

	cmd_cfg |= (cmd_cfg_timeout & CMD_CFG_TIMEOUT_MASK) <<

		   CMD_CFG_TIMEOUT_SHIFT;



	host->cmd = cmd;



	/* Last descriptor */

	desc->cmd_cfg |= CMD_CFG_END_OF_CHAIN;

	writel(desc->cmd_cfg, host->regs + SD_EMMC_CMD_CFG);

	writel(desc->cmd_data, host->regs + SD_EMMC_CMD_DAT);

	writel(desc->cmd_resp, host->regs + SD_EMMC_CMD_RSP);

	cmd_cfg |= CMD_CFG_END_OF_CHAIN;

	writel(cmd_cfg, host->regs + SD_EMMC_CMD_CFG);

	writel(cmd_data, host->regs + SD_EMMC_CMD_DAT);

	writel(0, host->regs + SD_EMMC_CMD_RSP);

	wmb(); /* ensure descriptor is written before kicked */

	writel(desc->cmd_arg, host->regs + SD_EMMC_CMD_ARG);

	writel(cmd->arg, host->regs + SD_EMMC_CMD_ARG);

}



static void meson_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)