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

Commit 8b22c3c1 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: tmio: add CMD23 support 



Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent f5fdcd1d

drivers/mmc/host/tmio_mmc_core.c

+28 −13
Original line number Diff line number Diff line
@@ -368,11 +368,11 @@ static int tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command 
			c |= TRANSFER_MULTI;



			/*

			 * Disable auto CMD12 at IO_RW_EXTENDED when

			 * multiple block transfer

			 * Disable auto CMD12 at IO_RW_EXTENDED and SET_BLOCK_COUNT

			 * when doing multiple block transfer

			 */

			if ((host->pdata->flags & TMIO_MMC_HAVE_CMD12_CTRL) &&

			    (cmd->opcode == SD_IO_RW_EXTENDED))

			    (cmd->opcode == SD_IO_RW_EXTENDED || host->mrq->sbc))

				c |= NO_CMD12_ISSUE;

		}

		if (data->flags & MMC_DATA_READ)
@@ -549,7 +549,7 @@ void tmio_mmc_do_data_irq(struct tmio_mmc_host *host) 
			host->mrq);

	}



	if (stop) {

	if (stop && !host->mrq->sbc) {

		if (stop->opcode != MMC_STOP_TRANSMISSION || stop->arg)

			dev_err(&host->pdev->dev, "unsupported stop: CMD%u,0x%x. We did CMD12,0\n",

				stop->opcode, stop->arg);
@@ -857,15 +857,21 @@ static int tmio_mmc_execute_tuning(struct mmc_host *mmc, u32 opcode) 


static void tmio_process_mrq(struct tmio_mmc_host *host, struct mmc_request *mrq)

{

	struct mmc_command *cmd;

	int ret;



	if (mrq->sbc && host->cmd != mrq->sbc) {

		cmd = mrq->sbc;

	} else {

		cmd = mrq->cmd;

		if (mrq->data) {

			ret = tmio_mmc_start_data(host, mrq->data);

			if (ret)

				goto fail;

		}

	}



	ret = tmio_mmc_start_command(host, mrq->cmd);

	ret = tmio_mmc_start_command(host, cmd);

	if (ret)

		goto fail;
@@ -920,13 +926,16 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host) 
		return;

	}



	/* If not SET_BLOCK_COUNT, clear old data */

	if (host->cmd != mrq->sbc) {

		host->cmd = NULL;

		host->data = NULL;

		host->force_pio = false;

		host->mrq = NULL;

	}



	cancel_delayed_work(&host->delayed_reset_work);



	host->mrq = NULL;

	spin_unlock_irqrestore(&host->lock, flags);



	if (mrq->cmd->error || (mrq->data && mrq->data->error))
@@ -935,6 +944,12 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host) 
	if (host->check_scc_error)

		host->check_scc_error(host);



	/* If SET_BLOCK_COUNT, continue with main command */

	if (host->mrq) {

		tmio_process_mrq(host, mrq);

		return;

	}



	mmc_request_done(host->mmc, mrq);

}