mmc: tmio: sdhi: Track SMPCMP valu in private data

Retain the SMPCMP value from last calibration in private data.
This will be later used for skipping bad taps.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index acc44e5b9069319b649399e81c4fd238ae0338ca..2f34173d037508d7e42832ad2ab7bf3822419fb0 100644 (file)
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -289,7 +289,7 @@ static unsigned int renesas_sdhi_compare_scc_data(struct tmio_sd_priv *priv)
 }
 
 static int renesas_sdhi_select_tuning(struct tmio_sd_priv *priv,
-                                    unsigned int taps, unsigned int smpcmp)
+                                    unsigned int taps)
 {
        unsigned long tap_cnt;  /* counter of tuning success */
        unsigned long tap_start;/* start position of tuning success */
@@ -311,9 +311,9 @@ static int renesas_sdhi_select_tuning(struct tmio_sd_priv *priv,
                        taps &= ~BIT(i % priv->tap_num);
                        taps &= ~BIT((i % priv->tap_num) + priv->tap_num);
                }
-               if (!(smpcmp & BIT(i))) {
-                       smpcmp &= ~BIT(i % priv->tap_num);
-                       smpcmp &= ~BIT((i % priv->tap_num) + priv->tap_num);
+               if (!(priv->smpcmp & BIT(i))) {
+                       priv->smpcmp &= ~BIT(i % priv->tap_num);
+                       priv->smpcmp &= ~BIT((i % priv->tap_num) + priv->tap_num);
                }
        }
 
@@ -355,7 +355,7 @@ static int renesas_sdhi_select_tuning(struct tmio_sd_priv *priv,
                tap_start = 0;
                tap_end = 0;
                for (i = 0; i < priv->tap_num * 2; i++) {
-                       if (smpcmp & BIT(i))
+                       if (priv->smpcmp & BIT(i))
                                ntap++;
                        else {
                                if (ntap > match_cnt) {
@@ -398,7 +398,7 @@ int renesas_sdhi_execute_tuning(struct udevice *dev, uint opcode)
        struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
        struct mmc *mmc = upriv->mmc;
        unsigned int tap_num;
-       unsigned int taps = 0, smpcmp = 0;
+       unsigned int taps = 0;
        int i, ret = 0;
        u32 caps;
 
@@ -426,6 +426,8 @@ int renesas_sdhi_execute_tuning(struct udevice *dev, uint opcode)
                goto out;
        }
 
+       priv->smpcmp = 0;
+
        /* Issue CMD19 twice for each tap */
        for (i = 0; i < 2 * priv->tap_num; i++) {
                renesas_sdhi_prepare_tuning(priv, i % priv->tap_num);
@@ -443,12 +445,12 @@ int renesas_sdhi_execute_tuning(struct udevice *dev, uint opcode)
 
                ret = renesas_sdhi_compare_scc_data(priv);
                if (ret == 0)
-                       smpcmp |= BIT(i);
+                       priv->smpcmp |= BIT(i);
 
                mdelay(1);
        }
 
-       ret = renesas_sdhi_select_tuning(priv, taps, smpcmp);
+       ret = renesas_sdhi_select_tuning(priv, taps);
 
 out:
        if (ret < 0) {

diff --git a/drivers/mmc/tmio-common.h b/drivers/mmc/tmio-common.h
index da89cc90c20b1d7911c2fbe39a5ddd6d3076d945..79f51d21af616e85801dc52f98d34aec28e14550 100644 (file)
--- a/drivers/mmc/tmio-common.h
+++ b/drivers/mmc/tmio-common.h
@@ -137,6 +137,7 @@ struct tmio_sd_priv {
        struct clk                      clk;
 #endif
 #if CONFIG_IS_ENABLED(RENESAS_SDHI)
+       unsigned int                    smpcmp;
        u8                              tap_set;
        u8                              tap_num;
        u8                              nrtaps;