mmc: renesas-sdhi: Send stop when MMC tuning command fails

When tuning command (CMD21) fails with command error, call
mmc_send_stop_transmission() to send stop command (CMD12).

Reviewed-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Reviewed-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Signed-off-by: Hai Pham <hai.pham.ud@renesas.com>
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
[Marek: Add dev_dbg() message in case tuning abort fails
        Move tuning opcode check from mmc_abort_tuning()]
Reviewed-by: Peng Fan <peng.fan@nxp.com>

diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index 280d96dbc2dedf448eaffee4efe3b073e2a8cc64..8e716f74491f8d66b62a32440b288157b816d107 100644 (file)
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -611,6 +611,17 @@ int renesas_sdhi_execute_tuning(struct udevice *dev, uint opcode)
                        priv->smpcmp |= BIT(i);
 
                mdelay(1);
+
+               /*
+                * eMMC specification specifies that CMD12 can be used to stop a tuning
+                * command, but SD specification does not, so do nothing unless it is
+                * eMMC.
+                */
+               if (ret && (opcode == MMC_CMD_SEND_TUNING_BLOCK_HS200)) {
+                       ret = mmc_send_stop_transmission(mmc, false);
+                       if (ret < 0)
+                               dev_dbg(dev, "Tuning abort fail (%d)\n", ret);
+               }
        }
 
        ret = renesas_sdhi_select_tuning(priv, taps);