Skip to contentSkip to conversation

mmc: renesas_sdhi: drop local flag for tuning

PATCH In review Wolfram Sang 3 participants 3 messages Sep 22, 2020 – Sep 24, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mmc: renesas_sdhi: drop local flag for tuning

From: Wolfram Sang <[email protected]>

The MMC core has now a generic check if some tuning is in progress. Its protected area is a bit larger than the custom one in this driver but we concluded that this works equally well for the intended case. So, drop the local flag and switch to the generic one.

---

I had this patch applied while working on other SDHI topics and experienced no regressions. But I'd like to give Shimoda-san and the BSP team some time for testing. We agreed on the approach already.

 drivers/mmc/host/renesas_sdhi.h      | 1 -
 drivers/mmc/host/renesas_sdhi_core.c | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/mmc/host/renesas_sdhi.h +0 -1
index 24958de274c1..cb962c7883dc 100644
@@ -63,7 +63,6 @@ struct renesas_sdhi {
 	u32 scc_tappos_hs400;
 	const u8 *adjust_hs400_calib_table;
 	bool needs_adjust_hs400;
-	bool doing_tune;
 
 	/* Tuning values: 1 for success, 0 for failure */
 	DECLARE_BITMAP(taps, BITS_PER_LONG);
drivers/mmc/host/renesas_sdhi_core.c +1 -3
index d621a4af8e87..20e5eb63caf8 100644
@@ -581,7 +581,6 @@ static int renesas_sdhi_select_tuning(struct tmio_mmc_host *host)
 	unsigned int taps_size = priv->tap_num * 2, min_tap_row;
 	unsigned long *bitmap;
 
-	priv->doing_tune = false;
 	sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_RVSREQ, 0);
 
 	/*
@@ -656,7 +655,6 @@ static int renesas_sdhi_execute_tuning(struct mmc_host *mmc, u32 opcode)
 		return -EINVAL;
 	}
 
-	priv->doing_tune = true;
 	bitmap_zero(priv->taps, priv->tap_num * 2);
 	bitmap_zero(priv->smpcmp, priv->tap_num * 2);
 
@@ -765,7 +763,7 @@ static bool renesas_sdhi_check_scc_error(struct tmio_mmc_host *host)
 	    !(host->mmc->ios.timing == MMC_TIMING_MMC_HS400 && !use_4tap))
 		return false;
 
-	if (mmc_doing_retune(host->mmc) || priv->doing_tune)
+	if (mmc_doing_tune(host->mmc))
 		return false;
 
 	if (sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_RVSCNTL) &
Signature · 1 line
2.20.1
Reviewed-by Tested-by on v1 1/1
#1 lore raw

Hi Wolfram-san,

Quoted 9 lines

From: Wolfram Sang, Sent: Wednesday, September 23, 2020 2:23 AM

From: Wolfram Sang <[email protected]>

The MMC core has now a generic check if some tuning is in progress. Its protected area is a bit larger than the custom one in this driver but we concluded that this works equally well for the intended case. So, drop the local flag and switch to the generic one.

Quoted 6 lines

---

I had this patch applied while working on other SDHI topics and experienced no regressions. But I'd like to give Shimoda-san and the BSP team some time for testing. We agreed on the approach already.

Thank you for the patch!

And, I tested on r8a779[56]1-salvator-xs. So,

Best regards,
Yoshihiro Shimoda

#2 lore raw
In reply to Wolfram Sang
Quoted 9 lines · Wolfram Sang

From: Wolfram Sang <[email protected]>

The MMC core has now a generic check if some tuning is in progress. Its protected area is a bit larger than the custom one in this driver but we concluded that this works equally well for the intended case. So, drop the local flag and switch to the generic one.

Applied for next, thanks!

Kind regards
Uffe

Quoted 54 lines

---

I had this patch applied while working on other SDHI topics and experienced no regressions. But I'd like to give Shimoda-san and the BSP team some time for testing. We agreed on the approach already.

 drivers/mmc/host/renesas_sdhi.h      | 1 -
 drivers/mmc/host/renesas_sdhi_core.c | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/mmc/host/renesas_sdhi.h +0 -1
index 24958de274c1..cb962c7883dc 100644
@@ -63,7 +63,6 @@ struct renesas_sdhi {
        u32 scc_tappos_hs400;
        const u8 *adjust_hs400_calib_table;
        bool needs_adjust_hs400;
-       bool doing_tune;
 
        /* Tuning values: 1 for success, 0 for failure */
        DECLARE_BITMAP(taps, BITS_PER_LONG);
drivers/mmc/host/renesas_sdhi_core.c +1 -4
index d621a4af8e87..20e5eb63caf8 100644
@@ -581,7 +581,6 @@ static int renesas_sdhi_select_tuning(struct tmio_mmc_host *host)
        unsigned int taps_size = priv->tap_num * 2, min_tap_row;
        unsigned long *bitmap;
 
-       priv->doing_tune = false;
        sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_RVSREQ, 0);
 
        /*
@@ -656,7 +655,6 @@ static int renesas_sdhi_execute_tuning(struct mmc_host *mmc, u32 opcode)
                return -EINVAL;
        }
 
-       priv->doing_tune = true;
        bitmap_zero(priv->taps, priv->tap_num * 2);
        bitmap_zero(priv->smpcmp, priv->tap_num * 2);
 
@@ -765,7 +763,7 @@ static bool renesas_sdhi_check_scc_error(struct tmio_mmc_host *host)
            !(host->mmc->ios.timing == MMC_TIMING_MMC_HS400 && !use_4tap))
                return false;
 
-       if (mmc_doing_retune(host->mmc) || priv->doing_tune)
+       if (mmc_doing_tune(host->mmc))
                return false;
 
        if (sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_RVSCNTL) &
--

2.20.1