mmc: renesas_sdhi: Set the SDBUF after reset
authorClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Tue, 30 Apr 2024 09:37:24 +0000 (12:37 +0300)
committerUlf Hansson <ulf.hansson@linaro.org>
Fri, 3 May 2024 12:30:49 +0000 (14:30 +0200)
For development purpose, renesas_sdhi_probe() could be called w/
dma_ops = NULL to force the usage of PIO mode. In this case the
renesas_sdhi_enable_dma() will not be called before transferring data.

If renesas_sdhi_enable_dma() is not called, renesas_sdhi_clk_enable()
call from renesas_sdhi_probe() will configure SDBUF by calling the
renesas_sdhi_sdbuf_width() function, but then SDBUF will be reset in
tmio_mmc_host_probe() when calling tmio_mmc_reset() though host->reset().
If SDBUF is zero the data transfer will not work in PIO mode for RZ/G3S.

To fix this call again the renesas_sdhi_sdbuf_width(host, 16) in
renesas_sdhi_reset(). The call of renesas_sdhi_sdbuf_width() was not
removed from renesas_sdhi_clk_enable() as the host->reset() is optional.

Co-developed-by: Hien Huynh <hien.huynh.px@renesas.com>
Signed-off-by: Hien Huynh <hien.huynh.px@renesas.com>
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20240430093724.2692232-1-claudiu.beznea.uj@bp.renesas.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/renesas_sdhi_core.c

index c675dec587efb2255dc360b1bceb87272927f0e7..12f4faaaf4ee498eb9c0b73f6ed507dfe1f61837 100644 (file)
@@ -589,6 +589,9 @@ static void renesas_sdhi_reset(struct tmio_mmc_host *host, bool preserve)
                        sd_ctrl_write16(host, CTL_RESET_SD, 0x0001);
                        priv->needs_adjust_hs400 = false;
                        renesas_sdhi_set_clock(host, host->clk_cache);
+
+                       /* Ensure default value for this driver. */
+                       renesas_sdhi_sdbuf_width(host, 16);
                } else if (priv->scc_ctl) {
                        renesas_sdhi_scc_reset(host, priv);
                }