Commit 6c2c6506 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: dw_mmc: Convert to mmc_send_tuning() 



Instead of having a local hack taking care of sending the tuning
command and as well to verify the response pattern, let's convert to
the common mmc_send_tuning() API.

This change affects the Exynos variant, since it's the only one which
support the dw_mmc's ->execute_tuning() callback.

It's seems like dw_mmc internal logic expects failed data transfers to
be ended using a stop command. Let the tuning requests also fall into
this category, since there are data transfer involved.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
Tested-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
parent 6f2d3c89

drivers/mmc/host/dw_mmc-exynos.c

+3 −45
Original line number Diff line number Diff line
@@ -340,64 +340,23 @@ out: 
	return loc;

}



static int dw_mci_exynos_execute_tuning(struct dw_mci_slot *slot, u32 opcode,

					struct dw_mci_tuning_data *tuning_data)

static int dw_mci_exynos_execute_tuning(struct dw_mci_slot *slot)

{

	struct dw_mci *host = slot->host;

	struct mmc_host *mmc = slot->mmc;

	const u8 *blk_pattern = tuning_data->blk_pattern;

	u8 *blk_test;

	unsigned int blksz = tuning_data->blksz;

	u8 start_smpl, smpl, candiates = 0;

	s8 found = -1;

	int ret = 0;



	blk_test = kmalloc(blksz, GFP_KERNEL);

	if (!blk_test)

		return -ENOMEM;



	start_smpl = dw_mci_exynos_get_clksmpl(host);



	do {

		struct mmc_request mrq = {NULL};

		struct mmc_command cmd = {0};

		struct mmc_command stop = {0};

		struct mmc_data data = {0};

		struct scatterlist sg;



		cmd.opcode = opcode;

		cmd.arg = 0;

		cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;



		stop.opcode = MMC_STOP_TRANSMISSION;

		stop.arg = 0;

		stop.flags = MMC_RSP_R1B | MMC_CMD_AC;



		data.blksz = blksz;

		data.blocks = 1;

		data.flags = MMC_DATA_READ;

		data.sg = &sg;

		data.sg_len = 1;



		sg_init_one(&sg, blk_test, blksz);

		mrq.cmd = &cmd;

		mrq.stop = &stop;

		mrq.data = &data;

		host->mrq = &mrq;



		mci_writel(host, TMOUT, ~0);

		smpl = dw_mci_exynos_move_next_clksmpl(host);



		mmc_wait_for_req(mmc, &mrq);



		if (!cmd.error && !data.error) {

			if (!memcmp(blk_pattern, blk_test, blksz))

		if (!mmc_send_tuning(mmc))

			candiates |= (1 << smpl);

		} else {

			dev_dbg(host->dev,

				"Tuning error: cmd.error:%d, data.error:%d\n",

				cmd.error, data.error);

		}



	} while (start_smpl != smpl);



	found = dw_mci_exynos_get_best_clksmpl(candiates);
@@ -406,7 +365,6 @@ static int dw_mci_exynos_execute_tuning(struct dw_mci_slot *slot, u32 opcode, 
	else

		ret = -EIO;



	kfree(blk_test);

	return ret;

}

drivers/mmc/host/dw_mmc.c

+4 −22
Original line number Diff line number Diff line
@@ -314,7 +314,9 @@ static u32 dw_mci_prep_stop_abort(struct dw_mci *host, struct mmc_command *cmd) 
	if (cmdr == MMC_READ_SINGLE_BLOCK ||

	    cmdr == MMC_READ_MULTIPLE_BLOCK ||

	    cmdr == MMC_WRITE_BLOCK ||

	    cmdr == MMC_WRITE_MULTIPLE_BLOCK) {

	    cmdr == MMC_WRITE_MULTIPLE_BLOCK ||

	    cmdr == MMC_SEND_TUNING_BLOCK ||

	    cmdr == MMC_SEND_TUNING_BLOCK_HS200) {

		stop->opcode = MMC_STOP_TRANSMISSION;

		stop->arg = 0;

		stop->flags = MMC_RSP_R1B | MMC_CMD_AC;
@@ -1312,30 +1314,10 @@ static int dw_mci_execute_tuning(struct mmc_host *mmc, u32 opcode) 
	struct dw_mci_slot *slot = mmc_priv(mmc);

	struct dw_mci *host = slot->host;

	const struct dw_mci_drv_data *drv_data = host->drv_data;

	struct dw_mci_tuning_data tuning_data;

	int err = -ENOSYS;



	if (opcode == MMC_SEND_TUNING_BLOCK_HS200) {

		if (mmc->ios.bus_width == MMC_BUS_WIDTH_8) {

			tuning_data.blk_pattern = tuning_blk_pattern_8bit;

			tuning_data.blksz = sizeof(tuning_blk_pattern_8bit);

		} else if (mmc->ios.bus_width == MMC_BUS_WIDTH_4) {

			tuning_data.blk_pattern = tuning_blk_pattern_4bit;

			tuning_data.blksz = sizeof(tuning_blk_pattern_4bit);

		} else {

			return -EINVAL;

		}

	} else if (opcode == MMC_SEND_TUNING_BLOCK) {

		tuning_data.blk_pattern = tuning_blk_pattern_4bit;

		tuning_data.blksz = sizeof(tuning_blk_pattern_4bit);

	} else {

		dev_err(host->dev,

			"Undefined command(%d) for tuning\n", opcode);

		return -EINVAL;

	}



	if (drv_data && drv_data->execute_tuning)

		err = drv_data->execute_tuning(slot, opcode, &tuning_data);

		err = drv_data->execute_tuning(slot);

	return err;

}

drivers/mmc/host/dw_mmc.h

+1 −7
Original line number Diff line number Diff line
@@ -249,11 +249,6 @@ struct dw_mci_slot { 
	int			sdio_id;

};



struct dw_mci_tuning_data {

	const u8 *blk_pattern;

	unsigned int blksz;

};



/**

 * dw_mci driver data - dw-mshc implementation specific driver data.

 * @caps: mmc subsystem specified capabilities of the controller(s).
@@ -275,7 +270,6 @@ struct dw_mci_drv_data { 
	void		(*prepare_command)(struct dw_mci *host, u32 *cmdr);

	void		(*set_ios)(struct dw_mci *host, struct mmc_ios *ios);

	int		(*parse_dt)(struct dw_mci *host);

	int		(*execute_tuning)(struct dw_mci_slot *slot, u32 opcode,

					struct dw_mci_tuning_data *tuning_data);

	int		(*execute_tuning)(struct dw_mci_slot *slot);

};

#endif /* _DW_MMC_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE