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

Commit a87852c6 authored by Niklas Söderlund's avatar Niklas Söderlund Committed by Ulf Hansson
Browse files

mmc: tmio: fix reset operation 



SD / MMC did not operate properly when suspend transition failed.
Because the SCC was not reset at resume, issue of the command failed.
Call the host specific reset function and reset the hardware in order to
add reset of SCC. This change also fixes tuning on some stubborn cards
on Gen2.

Based on work from Masaharu Hayakawa.

Signed-off-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent ac1e25c8

drivers/mmc/host/tmio_mmc_core.c

+15 −12
Original line number Diff line number Diff line
@@ -171,6 +171,18 @@ static void tmio_mmc_reset(struct tmio_mmc_host *host) 
	}

}



static void tmio_mmc_hw_reset(struct mmc_host *mmc)

{

	struct tmio_mmc_host *host = mmc_priv(mmc);



	host->reset(host);



	tmio_mmc_abort_dma(host);



	if (host->hw_reset)

		host->hw_reset(host);

}



static void tmio_mmc_reset_work(struct work_struct *work)

{

	struct tmio_mmc_host *host = container_of(work, struct tmio_mmc_host,
@@ -209,12 +221,11 @@ static void tmio_mmc_reset_work(struct work_struct *work) 


	spin_unlock_irqrestore(&host->lock, flags);



	host->reset(host);

	tmio_mmc_hw_reset(host->mmc);



	/* Ready for new calls */

	host->mrq = NULL;



	tmio_mmc_abort_dma(host);

	mmc_request_done(host->mmc, mrq);

}
@@ -696,14 +707,6 @@ static int tmio_mmc_start_data(struct tmio_mmc_host *host, 
	return 0;

}



static void tmio_mmc_hw_reset(struct mmc_host *mmc)

{

	struct tmio_mmc_host *host = mmc_priv(mmc);



	if (host->hw_reset)

		host->hw_reset(host);

}



static int tmio_mmc_execute_tuning(struct mmc_host *mmc, u32 opcode)

{

	struct tmio_mmc_host *host = mmc_priv(mmc);
@@ -1226,7 +1229,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) 
		_host->sdio_irq_mask = TMIO_SDIO_MASK_ALL;



	_host->set_clock(_host, 0);

	_host->reset(_host);

	tmio_mmc_hw_reset(mmc);



	_host->sdcard_irq_mask = sd_ctrl_read16_and_16_as_32(_host, CTL_IRQ_MASK);

	tmio_mmc_disable_mmc_irqs(_host, TMIO_MASK_ALL);
@@ -1327,7 +1330,7 @@ int tmio_mmc_host_runtime_resume(struct device *dev) 
	struct tmio_mmc_host *host = dev_get_drvdata(dev);



	tmio_mmc_clk_enable(host);

	host->reset(host);

	tmio_mmc_hw_reset(host->mmc);



	if (host->clk_cache)

		host->set_clock(host, host->clk_cache);