Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: renesas_sdhi: fix regression with hard reset on old SDHIs

Old SDHI instances have a default value for the reset register which
keeps it in reset state by default. So, when applying a hard reset we
need to manually leave the soft reset state as well. Later SDHI
instances have a different default value, the one we write manually now.

Fixes: b4d86f37eacb ("mmc: renesas_sdhi: do hard reset if possible")
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210826082107.47299-1-wsa+renesas@sang-engineering.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Wolfram Sang and committed by
Ulf Hansson
b81bede4 26391e49

+2
+2
drivers/mmc/host/renesas_sdhi_core.c
··· 561 561 /* Unknown why but without polling reset status, it will hang */ 562 562 read_poll_timeout(reset_control_status, ret, ret == 0, 1, 100, 563 563 false, priv->rstc); 564 + /* At least SDHI_VER_GEN2_SDR50 needs manual release of reset */ 565 + sd_ctrl_write16(host, CTL_RESET_SD, 0x0001); 564 566 priv->needs_adjust_hs400 = false; 565 567 renesas_sdhi_set_clock(host, host->clk_cache); 566 568 } else if (priv->scc_ctl) {