mmc: renesas-sdhi: Stop transmission in case tuning block transfer fails

The current code uses the state of tuning block received by SCC to
determine whether or not to send transmission stop command. This is
not correct. Use the state of tuning block transfer to determine
whether or not to send transmission stop command instead, because
the transmission stop command has to be sent in case the tuning
block transfer failed.

This requires two changes, separate variable to store and check the
state of tuning block received by SCC, and another separate variable
to store and check return value from transmission stop command.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
Tested-by: Paul Barker <paul.barker.ct@bp.renesas.com>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index 4ee8657f79505be001f0665b7db006e9ff3f686f..7f37d7af1867e7692b80570b389a9df5079544e7 100644 (file)
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -568,8 +568,8 @@ int renesas_sdhi_execute_tuning(struct udevice *dev, uint opcode)
        struct mmc *mmc = upriv->mmc;
        unsigned int tap_num;
        unsigned int taps = 0;
-       int i, ret = 0;
-       u32 caps;
+       int i, ret = 0, sret;
+       u32 caps, reg;
 
        /* Only supported on Renesas RCar */
        if (!(priv->caps & TMIO_SD_CAP_RCAR_UHS))
@@ -612,8 +612,8 @@ int renesas_sdhi_execute_tuning(struct udevice *dev, uint opcode)
                if (ret == 0)
                        taps |= BIT(i);
 
-               ret = renesas_sdhi_compare_scc_data(priv);
-               if (ret == 0)
+               reg = renesas_sdhi_compare_scc_data(priv);
+               if (reg == 0)
                        priv->smpcmp |= BIT(i);
 
                mdelay(1);
@@ -624,9 +624,9 @@ int renesas_sdhi_execute_tuning(struct udevice *dev, uint opcode)
                 * 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);
+                       sret = mmc_send_stop_transmission(mmc, false);
+                       if (sret < 0)
+                               dev_dbg(dev, "Tuning abort fail (%d)\n", sret);
                }
        }