Commit e8853ef0 authored Aug 30, 2018 by Masaharu Hayakawa Committed by Greg Kroah-Hartman Nov 24, 2019

mmc: tmio: Fix SCC error detection



[ Upstream commit b85fb0a1c8aeaaa40d08945d51a6656b512173f0 ]

SDR104, HS200 and HS400 need to check for SCC error. If SCC error is
detected, retuning is necessary.

Signed-off-by: Masaharu Hayakawa <masaharu.hayakawa.ry@renesas.com>
[Niklas: update commit message]
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 01395b5f

drivers/mmc/host/tmio_mmc_core.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -926,8 +926,8 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host)
	if (mrq->cmd->error \|\| (mrq->data && mrq->data->error))		if (mrq->cmd->error \|\| (mrq->data && mrq->data->error))
	tmio_mmc_abort_dma(host);		tmio_mmc_abort_dma(host);

	if (host->check_scc_error)		if (host->check_scc_error && host->check_scc_error(host))
	host->check_scc_error(host);		mrq->cmd->error = -EILSEQ;

	/* If SET_BLOCK_COUNT, continue with main command */		/* If SET_BLOCK_COUNT, continue with main command */
	if (host->mrq && !mrq->cmd->error) {		if (host->mrq && !mrq->cmd->error) {