a few sdhci/imx clean up and fix patches

Switch to use the more robust common mmc_regulator_set_vqmmc() function in MMC core which set the target voltage as close as possible to target voltage.

We did not re-factor the whole sdhci_start_signal_voltage_switch() cause we want to keep the original signal switch order between host and card to avoid potential break.

Signed-off-by Dong Aisheng <[email protected]>

---
 drivers/mmc/host/sdhci.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

drivers/mmc/host/sdhci.c +3 -6

index 2ee8bfa77116..7894652b9929 100644
@@ -1835,8 +1835,7 @@ static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc,
 		sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2);
 
 		if (!IS_ERR(mmc->supply.vqmmc)) {
-			ret = regulator_set_voltage(mmc->supply.vqmmc, 2700000,
-						    3600000);
+			ret = mmc_regulator_set_vqmmc(mmc, ios);
 			if (ret) {
 				pr_warn("%s: Switching to 3.3V signalling voltage failed\n",
 					mmc_hostname(mmc));

@@ -1859,8 +1858,7 @@ static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc,
 		if (!(host->flags & SDHCI_SIGNALING_180))
 			return -EINVAL;
 		if (!IS_ERR(mmc->supply.vqmmc)) {
-			ret = regulator_set_voltage(mmc->supply.vqmmc,
-					1700000, 1950000);
+			ret = mmc_regulator_set_vqmmc(mmc, ios);
 			if (ret) {
 				pr_warn("%s: Switching to 1.8V signalling voltage failed\n",
 					mmc_hostname(mmc));

@@ -1892,8 +1890,7 @@ static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc,
 		if (!(host->flags & SDHCI_SIGNALING_120))
 			return -EINVAL;
 		if (!IS_ERR(mmc->supply.vqmmc)) {
-			ret = regulator_set_voltage(mmc->supply.vqmmc, 1100000,
-						    1300000);
+			ret = mmc_regulator_set_vqmmc(mmc, ios);
 			if (ret) {
 				pr_warn("%s: Switching to 1.2V signalling voltage failed\n",
 					mmc_hostname(mmc));

Currently, we config the watermark_level register only in probe. This will cause the mmc write operation timeout issue after system resume back in LPSR mode. Because in LPSR mode, after system resume back, the watermark_level register(0x44) changes to 0x08000880, which set the write watermark level as 0, and set the read watermark level as 128. This value is incorrect.

This patch restores the setting of watermark level register after system resume back.

Signed-off-by Dong Aisheng <[email protected]>

---
 drivers/mmc/host/sdhci-esdhc-imx.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

drivers/mmc/host/sdhci-esdhc-imx.c +10 -1

index f94c1efff830..91c6a6864e15 100644
@@ -39,6 +39,7 @@
 #define  ESDHC_VENDOR_SPEC_VSELECT	(1 << 1)
 #define  ESDHC_VENDOR_SPEC_FRC_SDCLK_ON	(1 << 8)
 #define ESDHC_WTMK_LVL			0x44
+#define  ESDHC_WTMK_DEFAULT_VAL		0x10401040
 #define ESDHC_MIX_CTRL			0x48
 #define  ESDHC_MIX_CTRL_DDREN		(1 << 3)
 #define  ESDHC_MIX_CTRL_AC23EN		(1 << 7)

@@ -1157,7 +1158,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
 	 * to something insane.  Change it back here.
 	 */
 	if (esdhc_is_usdhc(imx_data)) {
-		writel(0x10401040, host->ioaddr + ESDHC_WTMK_LVL);
+		writel(ESDHC_WTMK_DEFAULT_VAL, host->ioaddr + ESDHC_WTMK_LVL);
 
 		host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN;
 		host->mmc->caps |= MMC_CAP_1_8V_DDR;

@@ -1261,6 +1262,14 @@ static int sdhci_esdhc_suspend(struct device *dev)
 
 static int sdhci_esdhc_resume(struct device *dev)
 {
+	struct sdhci_host *host = dev_get_drvdata(dev);
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
+
+	/* restore watermark setting in case it's lost in low power mode */
+	if (esdhc_is_usdhc(imx_data))
+		writel(ESDHC_WTMK_DEFAULT_VAL, host->ioaddr + ESDHC_WTMK_LVL);
+
 	return sdhci_pltfm_resume(dev);
 }
 

add tuning start point binding

Signed-off-by Dong Aisheng <[email protected]>

---
 Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt | 2 ++
 1 file changed, 2 insertions(+)

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt +0 -0

index dca56d6248f5..3e29050ec769 100644

Quoted 12 lines · Dong Aisheng

add tuning start point binding

Signed-off-by Dong Aisheng <[email protected]>

---
 Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt | 2 ++
 1 file changed, 2 insertions(+)

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt +0 -0

index dca56d6248f5..3e29050ec769 100644

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt Optional properties: · line 35

Quoted 8 lines

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt +2 -0

@@ -28,6 +28,8 @@ Optional properties:
   transparent level shifters on the outputs of the controller. Two cells are
   required, first cell specifies minimum slot voltage (mV), second cell
   specifies maximum slot voltage (mV). Several ranges could be specified.
+- fsl,tuning-start-tap: Specify the start dealy cell point when send first CMD19
+  in tuning procedure.
 - fsl,tuning-step: Specify the increasing delay cell steps in tuning procedure.
   The uSDHC use one delay cell as default increasing step to do tuning process.
   This property allows user to change the tuning step to more than one delay

Hi Dong

You say this is a patch which should be part of stable. How does it fulfil the requirements listed in

Linux/Documentation/stable_kernel_rules.txt

Thanks
Andrew

If HW supports SDHCI_TUNING_MODE_3 which is auto retuning, we won't retune during runtime suspend and resume, instead we use Re-tuning Request signaled via SDHCI_INT_RETUNE interrupt to do retuning and hw auto retuning during data transfer to guarantee the signal sample window correction.

This can avoid a mass of repeatedly retuning during small file system data access and improve the performance.

Signed-off-by Dong Aisheng <[email protected]>

---
 drivers/mmc/host/sdhci.c | 15 ++++++++++++---
 drivers/mmc/host/sdhci.h |  3 +++
 2 files changed, 15 insertions(+), 3 deletions(-)

drivers/mmc/host/sdhci.c +12 -3

index 7894652b9929..31c14b0ff8e2 100644
@@ -229,6 +229,10 @@ static void sdhci_init(struct sdhci_host *host, int soft)
 		    SDHCI_INT_TIMEOUT | SDHCI_INT_DATA_END |
 		    SDHCI_INT_RESPONSE;
 
+	if (host->tuning_mode == SDHCI_TUNING_MODE_2 ||
+	    host->tuning_mode == SDHCI_TUNING_MODE_3)
+		host->ier |= SDHCI_INT_RETUNE;
+
 	sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);
 	sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
 

@@ -2673,6 +2677,9 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
 			pr_err("%s: Card is consuming too much power!\n",
 				mmc_hostname(host->mmc));
 
+		if (intmask & SDHCI_INT_RETUNE)
+			mmc_retune_needed(host->mmc);
+
 		if (intmask & SDHCI_INT_CARD_INT) {
 			sdhci_enable_sdio_irq_nolock(host, false);
 			host->thread_isr |= SDHCI_INT_CARD_INT;

@@ -2682,7 +2689,7 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
 		intmask &= ~(SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE |
 			     SDHCI_INT_CMD_MASK | SDHCI_INT_DATA_MASK |
 			     SDHCI_INT_ERROR | SDHCI_INT_BUS_POWER |
-			     SDHCI_INT_CARD_INT);
+			     SDHCI_INT_RETUNE | SDHCI_INT_CARD_INT);
 
 		if (intmask) {
 			unexpected |= intmask;

@@ -2787,7 +2794,8 @@ int sdhci_suspend_host(struct sdhci_host *host)
 	sdhci_disable_card_detection(host);
 
 	mmc_retune_timer_stop(host->mmc);
-	mmc_retune_needed(host->mmc);
+	if (host->tuning_mode != SDHCI_TUNING_MODE_3)
+		mmc_retune_needed(host->mmc);
 
 	if (!device_may_wakeup(mmc_dev(host->mmc))) {
 		host->ier = 0;

@@ -2848,7 +2856,8 @@ int sdhci_runtime_suspend_host(struct sdhci_host *host)
 	unsigned long flags;
 
 	mmc_retune_timer_stop(host->mmc);
-	mmc_retune_needed(host->mmc);
+	if (host->tuning_mode != SDHCI_TUNING_MODE_3)
+		mmc_retune_needed(host->mmc);
 
 	spin_lock_irqsave(&host->lock, flags);
 	host->ier &= SDHCI_INT_CARD_INT;

drivers/mmc/host/sdhci.h +3 -0

index e241e11a90d0..0411c9f36461 100644
@@ -128,6 +128,7 @@
 #define  SDHCI_INT_CARD_INSERT	0x00000040
 #define  SDHCI_INT_CARD_REMOVE	0x00000080
 #define  SDHCI_INT_CARD_INT	0x00000100
+#define  SDHCI_INT_RETUNE	0x00001000
 #define  SDHCI_INT_ERROR	0x00008000
 #define  SDHCI_INT_TIMEOUT	0x00010000
 #define  SDHCI_INT_CRC		0x00020000

@@ -518,6 +519,8 @@ struct sdhci_host {
 	unsigned int		tuning_count;	/* Timer count for re-tuning */
 	unsigned int		tuning_mode;	/* Re-tuning mode supported by host */
 #define SDHCI_TUNING_MODE_1	0
+#define SDHCI_TUNING_MODE_2	1
+#define SDHCI_TUNING_MODE_3	2
 
 	unsigned long private[0] ____cacheline_aligned;
 };

Indicating hw auto retuning support for mx6qdl in the fake caps_1 register and enable auto retuning in post_tuning process after tuning completes.

Dong Aisheng, All,

Quoted 3 lines · Dong Aisheng

Indicating hw auto retuning support for mx6qdl in the fake caps_1 register and enable auto retuning in post_tuning process after tuning completes.

Have you tried this change with a SDIO3.0 device? I'm asking because a

similar change in latest NXP 4.1.15 kernel broke SDIO3.0 support. With this tuning, the kernel would report:
mmc2: Got data interrupt 0x00000002 even though no data operation was in progress.

Doing a 'git bisect' and then reverting this patch fixed the issue. Although I haven't tested that change on mainline kernel, I wanted you to know about this observation before it gets merged.

As a FYI, the issue has been reported to NXP community:
https://community.nxp.com/thread/431316

Regards,
Gary

Quoted 7 lines · Gary Bisson

Dong Aisheng, All,

Quoted 3 lines · Dong Aisheng

Indicating hw auto retuning support for mx6qdl in the fake caps_1 register and enable auto retuning in post_tuning process after tuning completes.

Quoted 1 line

Have you tried this change with a SDIO3.0 device? I'm asking because a

Tested with SD3.0 device.
Not really for SDIO3.0 device since there's no SDIO3.0 device on my available MX6Q/DL boards.

Quoted 5 lines

similar change in latest NXP 4.1.15 kernel broke SDIO3.0 support. With this tuning, the kernel would report:
mmc2: Got data interrupt 0x00000002 even though no data operation was in progress.

Can you provide the full enumeration log?

Quoted 7 lines

Doing a 'git bisect' and then reverting this patch fixed the issue. Although I haven't tested that change on mainline kernel, I wanted you to know about this observation before it gets merged.

As a FYI, the issue has been reported to NXP community:
https://community.nxp.com/thread/431316

Thanks for nofity.
I will check it on my side.

Quoted 8 lines · Dong Aisheng

Quoted 7 lines · Gary Bisson

Dong Aisheng, All,

Quoted 3 lines · Dong Aisheng

Indicating hw auto retuning support for mx6qdl in the fake caps_1 register and enable auto retuning in post_tuning process after tuning completes.

Quoted 5 lines

Quoted 1 line

Have you tried this change with a SDIO3.0 device? I'm asking because a

Tested with SD3.0 device.
Not really for SDIO3.0 device since there's no SDIO3.0 device on my available MX6Q/DL boards.

Someone answered on the Community that it has been tested on i.MX7 SABRE board but not on i.MX6 right?

Quoted 7 lines

Quoted 5 lines

similar change in latest NXP 4.1.15 kernel broke SDIO3.0 support. With this tuning, the kernel would report:
mmc2: Got data interrupt 0x00000002 even though no data operation was in progress.

Can you provide the full enumeration log?

Here is the mmc related part of dmesg:

# dmesg | grep mmc2
mmc2: SDHCI controller on 2194000.usdhc [2194000.usdhc] using ADMA
mmc2: queuing unknown CIS tuple 0x01 (3 bytes)
mmc2: queuing unknown CIS tuple 0x1a (5 bytes)
mmc2: queuing unknown CIS tuple 0x1b (8 bytes)
mmc2: queuing unknown CIS tuple 0x14 (0 bytes)
mmc2: queuing unknown CIS tuple 0x80 (1 bytes)
mmc2: queuing unknown CIS tuple 0x81 (1 bytes)
mmc2: queuing unknown CIS tuple 0x82 (1 bytes)
mmc2: new ultra high speed SDR104 SDIO card at address 0001
mmc2: queuing unknown CIS tuple 0x01 (3 bytes)
mmc2: queuing unknown CIS tuple 0x1a (5 bytes)
mmc2: queuing unknown CIS tuple 0x1b (8 bytes)
mmc2: queuing unknown CIS tuple 0x14 (0 bytes)
ar6k_wlan mmc2:0001:1: Direct firmware load for qsetup30.bin failed with
error -2
mmc2: Got data interrupt 0x00000002 even though no data operation was in
progress.
mmc2: Got data interrupt 0x00000002 even though no data operation was in
progress.

Without the MAN_TUN patch, everything is the same (as expected) but without the last two errors. Note that when WiFi connection is up, this warning keeps poping up every few seconds.

Quoted 8 lines

Quoted 7 lines

Doing a 'git bisect' and then reverting this patch fixed the issue. Although I haven't tested that change on mainline kernel, I wanted you to know about this observation before it gets merged.

As a FYI, the issue has been reported to NXP community:
https://community.nxp.com/thread/431316

Quoted 2 lines

Thanks for nofity.
I will check it on my side.

Not sure you've seen my last post from today, but you can actually try the device I'm using (QCA9377) on SABRE using the evaluation kit:
http://www.silexamerica.com/products/connectivity-solutions/embedded-wireless/sdio-radios/sx-sdcac/

Maybe there's a hw mod to do on SABRE in order to get SDIO3.0/1.8V vcc.

Regards,
Gary

Move all hw related static initializations into a separate function which helps concentrate the hw related initialization code. And that function could also be called by other places later as a basic hw state restore.
e.g. suspend/resume where the hw state is possible to lost due to low power mode.

Signed-off-by Dong Aisheng <[email protected]>

---
 drivers/mmc/host/sdhci-esdhc-imx.c | 72 +++++++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 32 deletions(-)

drivers/mmc/host/sdhci-esdhc-imx.c +40 -32

index bbb0bd4eac28..5a0e5dee977f 100644
@@ -979,6 +979,44 @@ static const struct sdhci_pltfm_data sdhci_esdhc_imx_pdata = {
 	.ops = &sdhci_esdhc_ops,
 };
 
+static void sdhci_esdhc_imx_hwinit(struct sdhci_host *host)
+{
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
+
+	if (esdhc_is_usdhc(imx_data)) {
+		/*
+		 * The imx6q ROM code will change the default watermark
+		 * level setting to something insane.  Change it back here.
+		 */
+		writel(ESDHC_WTMK_DEFAULT_VAL, host->ioaddr + ESDHC_WTMK_LVL);
+
+		/*
+		 * ROM code will change the bit burst_length_enable setting
+		 * to zero if this usdhc is choosed to boot system. Change
+		 * it back here, otherwise it will impact the performance a
+		 * lot. This bit is used to enable/disable the burst length
+		 * for the external AHB2AXI bridge, it's usefully especially
+		 * for INCR transfer because without burst length indicator,
+		 * the AHB2AXI bridge does not know the burst length in
+		 * advance. And without burst length indicator, AHB INCR
+		 * transfer can only be converted to singles on the AXI side.
+		 */
+		writel(readl(host->ioaddr + SDHCI_HOST_CONTROL)
+			| ESDHC_BURST_LEN_EN_INCR,
+			host->ioaddr + SDHCI_HOST_CONTROL);
+		/*
+		* errata ESDHC_FLAG_ERR004536 fix for MX6Q TO1.2 and MX6DL
+		* TO1.1, it's harmless for MX6SL
+		*/
+		writel(readl(host->ioaddr + 0x6c) | BIT(7),
+			host->ioaddr + 0x6c);
+
+		/* disable DLL_CTRL delay line settings */
+		writel(0x0, host->ioaddr + ESDHC_DLL_CTRL);
+	}
+}
+
 #ifdef CONFIG_OF
 static int
 sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,

@@ -1176,43 +1214,11 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
 		host->quirks |= SDHCI_QUIRK_NO_MULTIBLOCK
 			| SDHCI_QUIRK_BROKEN_ADMA;
 
-	/*
-	 * The imx6q ROM code will change the default watermark level setting
-	 * to something insane.  Change it back here.
-	 */
 	if (esdhc_is_usdhc(imx_data)) {
-		writel(ESDHC_WTMK_DEFAULT_VAL, host->ioaddr + ESDHC_WTMK_LVL);
-
 		host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN;
 		host->mmc->caps |= MMC_CAP_1_8V_DDR;
-
-		/*
-		 * ROM code will change the bit burst_length_enable setting
-		 * to zero if this usdhc is choosed to boot system. Change
-		 * it back here, otherwise it will impact the performance a
-		 * lot. This bit is used to enable/disable the burst length
-		 * for the external AHB2AXI bridge, it's usefully especially
-		 * for INCR transfer because without burst length indicator,
-		 * the AHB2AXI bridge does not know the burst length in
-		 * advance. And without burst length indicator, AHB INCR
-		 * transfer can only be converted to singles on the AXI side.
-		 */
-		writel(readl(host->ioaddr + SDHCI_HOST_CONTROL)
-			| ESDHC_BURST_LEN_EN_INCR,
-			host->ioaddr + SDHCI_HOST_CONTROL);
-
 		if (!(imx_data->socdata->flags & ESDHC_FLAG_HS200))
 			host->quirks2 |= SDHCI_QUIRK2_BROKEN_HS200;
-
-		/*
-		* errata ESDHC_FLAG_ERR004536 fix for MX6Q TO1.2 and MX6DL
-		* TO1.1, it's harmless for MX6SL
-		*/
-		writel(readl(host->ioaddr + 0x6c) | BIT(7),
-			host->ioaddr + 0x6c);
-
-		/* disable DLL_CTRL delay line settings */
-		writel(0x0, host->ioaddr + ESDHC_DLL_CTRL);
 	}
 
 	if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)

@@ -1237,6 +1243,8 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
 	if (err)
 		goto disable_clk;
 
+	sdhci_esdhc_imx_hwinit(host);
+
 	err = sdhci_add_host(host);
 	if (err)
 		goto disable_clk;

sdhci_esdhc_imx_hwinit() includes all basic hw intialization. Calling it after resume to re-initialize hw in case its state is already lost in low power mode.

Signed-off-by Dong Aisheng <[email protected]>

---
 drivers/mmc/host/sdhci-esdhc-imx.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

drivers/mmc/host/sdhci-esdhc-imx.c +2 -5

index c5adf4ba4066..e5b5d1c3eb01 100644
@@ -1297,12 +1297,9 @@ static int sdhci_esdhc_suspend(struct device *dev)
 static int sdhci_esdhc_resume(struct device *dev)
 {
 	struct sdhci_host *host = dev_get_drvdata(dev);
-	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-	struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host);
 
-	/* restore watermark setting in case it's lost in low power mode */
-	if (esdhc_is_usdhc(imx_data))
-		writel(ESDHC_WTMK_DEFAULT_VAL, host->ioaddr + ESDHC_WTMK_LVL);
+	/* re-initialize hw state in case it's lost in low power mode */
+	sdhci_esdhc_imx_hwinit(host);
 
 	return sdhci_pltfm_resume(dev);
 }

The tuning bits like FBCLK_SEL, SMP_CLK_SEL and DLY_CELL which affects timing may have already been set by ROM if booting from SD3.0 mode like SDR104. Let's clear it first during driver probe before doing the new card enumeration to avoid working on the wrong timing.

Note that tuning bits are dynamical settings which may need to be kept during MMC_PM_KEEP_POWER suspend, so we did not put them into hwinit function.

Signed-off-by Dong Aisheng <[email protected]>

---
 drivers/mmc/host/sdhci-esdhc-imx.c | 5 +++++
 1 file changed, 5 insertions(+)

drivers/mmc/host/sdhci-esdhc-imx.c +5 -0

index e5b5d1c3eb01..2bb326bbc34a 100644
@@ -1224,6 +1224,11 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
 		host->mmc->caps |= MMC_CAP_1_8V_DDR;
 		if (!(imx_data->socdata->flags & ESDHC_FLAG_HS200))
 			host->quirks2 |= SDHCI_QUIRK2_BROKEN_HS200;
+
+		/* clear tuning bits in case ROM has set it already */
+		writel(0x0, host->ioaddr + ESDHC_MIX_CTRL);
+		writel(0x0, host->ioaddr + SDHCI_ACMD12_ERR);
+		writel(0x0, host->ioaddr + ESDHC_TUNE_CTRL_STATUS);
 	}
 
 	if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)

Patch 1~10 are mainly sdhci cleanup patches while patch 7,9,10 are fixes which seems needed for stable tree as well.

The main work is:
1) using more robust mmc_regulator_set_vqmmc
2) add auto retune support
3) improve sdhci-esdhc-imx stability
4) add state save and restore for low power mode

Change Log:
v1->v2:
* address all Andrian's comments
* below patches are dropped
mmc: sdhci: move sdhci_get_cd() forward to avoid declaration
mmc: core: fix a comment typo
mmc: sdhci: re-factor sdhci_start_signal_voltage()
mmc: core: mmc_regulator_set_vqmmc not return error if vqmmc/vmmc not
exist
mmc: sdhci: check SDHCI_QUIRK2_NO_1_8_V when do voltage switch
mmc: sdhci: rename quirk SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12
Above clean up is not needed so far according to Andrian.

mmc: sdhci: fix incorrect get data interrupt during no data transfer
This one is not needed anymore cause Andrian had another fix already in tree.
(commit 0e0a35d2d4058 mmc: sdhci: Track whether a reset is pending)

mmc: core: disable auto retune during card detection process
This one will sent out in another patch series to fix in CORE.

v1:
http://www.spinics.net/lists/linux-mmc/msg36316.html

Dong Aisheng (15):
mmc: sdhci: using common mmc_regulator_set_vqmmc()
mmc: sdhci-esdhc-imx: remove SDHCI_QUIRK_BROKEN_TIMEOUT_VAL
mmc: sdhci-esdhc-imx: add esdhc specific suspend resume callback
mmc: sdhci-esdhc-imx: restore watermark level setting after resume
mmc: sdhci-esdhci-imx: disable DLL delay line settings explicitly
mmc: sdhci-esdhc-imx: support setting tuning start point
doc: dt: fsl-imx-esdhc: add set tuning start point binding
mmc: sdhci: add standard hw auto retuning support
mmc: sdhci-esdhc-imx: enable hw auto retuning for STD_TUNING
mmc: sdhci-esdhc-imx: enable hw auto retuning for MAN_TUNING
mmc: sdhci-esdhc-imx: fix strobe DLL lock wrong clock issue
mmc: sdhci-esdhc-imx: factor out hw related initialization into
function
mmc: sdhci-esdhc-imx: move tuning static configuration into hwinit
function
mmc: sdhci-esdhci-imx: re-initialize hw state after resume
mmc: sdhci-esdhc-imx: clear tuning bits during driver probe

 .../devicetree/bindings/mmc/fsl-imx-esdhc.txt      |   2 +
 drivers/mmc/host/sdhci-esdhc-imx.c                 | 149 ++++++++++++++-------
 drivers/mmc/host/sdhci.c                           |  24 ++--
 drivers/mmc/host/sdhci.h                           |   3 +
 include/linux/platform_data/mmc-esdhc-imx.h        |   1 +
 5 files changed, 122 insertions(+), 57 deletions(-)

Signature · 7 lines

1.9.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Quoted 2 lines · Dong Aisheng

Patch 1~10 are mainly sdhci cleanup patches while patch 7,9,10 are fixes which seems needed for stable tree as well.

Hi Dong

Fixed should be first, so they can be cherry-picked into stable. Cleanups come afterwards, since they will not be back ported into stable.

Please change the order of the patches within the series.

Andrew

Quoted 65 lines

The main work is:
1) using more robust mmc_regulator_set_vqmmc
2) add auto retune support
3) improve sdhci-esdhc-imx stability
4) add state save and restore for low power mode

Change Log:
v1->v2:
* address all Andrian's comments
* below patches are dropped
mmc: sdhci: move sdhci_get_cd() forward to avoid declaration
mmc: core: fix a comment typo
mmc: sdhci: re-factor sdhci_start_signal_voltage()
mmc: core: mmc_regulator_set_vqmmc not return error if vqmmc/vmmc not
exist
mmc: sdhci: check SDHCI_QUIRK2_NO_1_8_V when do voltage switch
mmc: sdhci: rename quirk SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12
Above clean up is not needed so far according to Andrian.

mmc: sdhci: fix incorrect get data interrupt during no data transfer
This one is not needed anymore cause Andrian had another fix already in tree.
(commit 0e0a35d2d4058 mmc: sdhci: Track whether a reset is pending)

mmc: core: disable auto retune during card detection process
This one will sent out in another patch series to fix in CORE.

v1:
http://www.spinics.net/lists/linux-mmc/msg36316.html

Dong Aisheng (15):
mmc: sdhci: using common mmc_regulator_set_vqmmc()
mmc: sdhci-esdhc-imx: remove SDHCI_QUIRK_BROKEN_TIMEOUT_VAL
mmc: sdhci-esdhc-imx: add esdhc specific suspend resume callback
mmc: sdhci-esdhc-imx: restore watermark level setting after resume
mmc: sdhci-esdhci-imx: disable DLL delay line settings explicitly
mmc: sdhci-esdhc-imx: support setting tuning start point
doc: dt: fsl-imx-esdhc: add set tuning start point binding
mmc: sdhci: add standard hw auto retuning support
mmc: sdhci-esdhc-imx: enable hw auto retuning for STD_TUNING
mmc: sdhci-esdhc-imx: enable hw auto retuning for MAN_TUNING
mmc: sdhci-esdhc-imx: fix strobe DLL lock wrong clock issue
mmc: sdhci-esdhc-imx: factor out hw related initialization into
function
mmc: sdhci-esdhc-imx: move tuning static configuration into hwinit
function
mmc: sdhci-esdhci-imx: re-initialize hw state after resume
mmc: sdhci-esdhc-imx: clear tuning bits during driver probe

 .../devicetree/bindings/mmc/fsl-imx-esdhc.txt      |   2 +
 drivers/mmc/host/sdhci-esdhc-imx.c                 | 149 ++++++++++++++-------
 drivers/mmc/host/sdhci.c                           |  24 ++--
 drivers/mmc/host/sdhci.h                           |   3 +
 include/linux/platform_data/mmc-esdhc-imx.h        |   1 +
 5 files changed, 122 insertions(+), 57 deletions(-)

Signature · 7 lines

1.9.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Thanks for the suggestion.
I think except patch 2 (mmc: sdhci-esdhc-imx: remove SDHCI_QUIRK_BROKEN_TIMEOUT_VAL) which is only a one line change, all others are good to be cherry-picked into stable.

Patch 1~10 are mainly sdhci cleanup patches while patch 7,9,10 are fixes which seems needed for stable tree as well.

The main work is:
1) using more robust mmc_regulator_set_vqmmc
2) add auto retune support
3) improve sdhci-esdhc-imx stability
4) add state save and restore for low power mode

Change Log:
v1->v2:
* address all Adrian's comments
* below patches are dropped
mmc: sdhci: move sdhci_get_cd() forward to avoid declaration
mmc: core: fix a comment typo
mmc: sdhci: re-factor sdhci_start_signal_voltage()
mmc: core: mmc_regulator_set_vqmmc not return error if vqmmc/vmmc not
exist
mmc: sdhci: check SDHCI_QUIRK2_NO_1_8_V when do voltage switch
mmc: sdhci: rename quirk SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12
Above clean up is not needed so far according to Adrian.

mmc: sdhci: fix incorrect get data interrupt during no data transfer
This one is not needed anymore cause Adrian had another fix already in tree.
(commit 0e0a35d2d4058 mmc: sdhci: Track whether a reset is pending)

mmc: core: disable auto retune during card detection process
This one will sent out in another patch series to fix in CORE.

v1:
http://www.spinics.net/lists/linux-mmc/msg36316.html

Dong Aisheng (15):
mmc: sdhci: using common mmc_regulator_set_vqmmc()
mmc: sdhci-esdhc-imx: remove SDHCI_QUIRK_BROKEN_TIMEOUT_VAL
mmc: sdhci-esdhc-imx: add esdhc specific suspend resume callback
mmc: sdhci-esdhc-imx: restore watermark level setting after resume
mmc: sdhci-esdhci-imx: disable DLL delay line settings explicitly
mmc: sdhci-esdhc-imx: support setting tuning start point
doc: dt: fsl-imx-esdhc: add set tuning start point binding
mmc: sdhci: add standard hw auto retuning support
mmc: sdhci-esdhc-imx: enable hw auto retuning for STD_TUNING
mmc: sdhci-esdhc-imx: enable hw auto retuning for MAN_TUNING
mmc: sdhci-esdhc-imx: fix strobe DLL lock wrong clock issue
mmc: sdhci-esdhc-imx: factor out hw related initialization into
function
mmc: sdhci-esdhc-imx: move tuning static configuration into hwinit
function
mmc: sdhci-esdhci-imx: re-initialize hw state after resume
mmc: sdhci-esdhc-imx: clear tuning bits during driver probe

 .../devicetree/bindings/mmc/fsl-imx-esdhc.txt      |   2 +
 drivers/mmc/host/sdhci-esdhc-imx.c                 | 149 ++++++++++++++-------
 drivers/mmc/host/sdhci.c                           |  24 ++--
 drivers/mmc/host/sdhci.h                           |   3 +
 include/linux/platform_data/mmc-esdhc-imx.h        |   1 +
 5 files changed, 122 insertions(+), 57 deletions(-)

Quoted 2 lines · Dong Aisheng

Patch 1~10 are mainly sdhci cleanup patches while patch 7,9,10 are fixes which seems needed for stable tree as well.

I have ack'ed all the sdhci-related patches. i.e. all but patch 7 the dt bindings change.

I am not sure what needs to be done for stable. I would suggest these patches are queued for 4.8, then Dong can send the relevant patches to the linux-stable mailing list separately after -rc1.

Quoted 57 lines

The main work is:
1) using more robust mmc_regulator_set_vqmmc
2) add auto retune support
3) improve sdhci-esdhc-imx stability
4) add state save and restore for low power mode

Change Log:
v1->v2:
* address all Adrian's comments
* below patches are dropped
mmc: sdhci: move sdhci_get_cd() forward to avoid declaration
mmc: core: fix a comment typo
mmc: sdhci: re-factor sdhci_start_signal_voltage()
mmc: core: mmc_regulator_set_vqmmc not return error if vqmmc/vmmc not
exist
mmc: sdhci: check SDHCI_QUIRK2_NO_1_8_V when do voltage switch
mmc: sdhci: rename quirk SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12
Above clean up is not needed so far according to Adrian.

mmc: sdhci: fix incorrect get data interrupt during no data transfer
This one is not needed anymore cause Adrian had another fix already in tree.
(commit 0e0a35d2d4058 mmc: sdhci: Track whether a reset is pending)

mmc: core: disable auto retune during card detection process
This one will sent out in another patch series to fix in CORE.

v1:
http://www.spinics.net/lists/linux-mmc/msg36316.html

Dong Aisheng (15):
mmc: sdhci: using common mmc_regulator_set_vqmmc()
mmc: sdhci-esdhc-imx: remove SDHCI_QUIRK_BROKEN_TIMEOUT_VAL
mmc: sdhci-esdhc-imx: add esdhc specific suspend resume callback
mmc: sdhci-esdhc-imx: restore watermark level setting after resume
mmc: sdhci-esdhci-imx: disable DLL delay line settings explicitly
mmc: sdhci-esdhc-imx: support setting tuning start point
doc: dt: fsl-imx-esdhc: add set tuning start point binding
mmc: sdhci: add standard hw auto retuning support
mmc: sdhci-esdhc-imx: enable hw auto retuning for STD_TUNING
mmc: sdhci-esdhc-imx: enable hw auto retuning for MAN_TUNING
mmc: sdhci-esdhc-imx: fix strobe DLL lock wrong clock issue
mmc: sdhci-esdhc-imx: factor out hw related initialization into
function
mmc: sdhci-esdhc-imx: move tuning static configuration into hwinit
function
mmc: sdhci-esdhci-imx: re-initialize hw state after resume
mmc: sdhci-esdhc-imx: clear tuning bits during driver probe

 .../devicetree/bindings/mmc/fsl-imx-esdhc.txt      |   2 +
 drivers/mmc/host/sdhci-esdhc-imx.c                 | 149 ++++++++++++++-------
 drivers/mmc/host/sdhci.c                           |  24 ++--
 drivers/mmc/host/sdhci.h                           |   3 +
 include/linux/platform_data/mmc-esdhc-imx.h        |   1 +
 5 files changed, 122 insertions(+), 57 deletions(-)

Patch 1~10 are mainly sdhci cleanup patches while patch 7,9,10 are fixes which seems needed for stable tree as well.

The main work is:
1) using more robust mmc_regulator_set_vqmmc
2) add auto retune support
3) improve sdhci-esdhc-imx stability
4) add state save and restore for low power mode

Change Log:
v1->v2:
* address all Andrian's comments
* below patches are dropped
mmc: sdhci: move sdhci_get_cd() forward to avoid declaration
mmc: core: fix a comment typo
mmc: sdhci: re-factor sdhci_start_signal_voltage()
mmc: core: mmc_regulator_set_vqmmc not return error if vqmmc/vmmc not
exist
mmc: sdhci: check SDHCI_QUIRK2_NO_1_8_V when do voltage switch
mmc: sdhci: rename quirk SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12
Above clean up is not needed so far according to Andrian.

mmc: sdhci: fix incorrect get data interrupt during no data transfer
This one is not needed anymore cause Andrian had another fix already in tree.
(commit 0e0a35d2d4058 mmc: sdhci: Track whether a reset is pending)

mmc: core: disable auto retune during card detection process
This one will sent out in another patch series to fix in CORE.

v1:
http://www.spinics.net/lists/linux-mmc/msg36316.html

Dong Aisheng (15):
mmc: sdhci: using common mmc_regulator_set_vqmmc()
mmc: sdhci-esdhc-imx: remove SDHCI_QUIRK_BROKEN_TIMEOUT_VAL
mmc: sdhci-esdhc-imx: add esdhc specific suspend resume callback
mmc: sdhci-esdhc-imx: restore watermark level setting after resume
mmc: sdhci-esdhci-imx: disable DLL delay line settings explicitly
mmc: sdhci-esdhc-imx: support setting tuning start point
doc: dt: fsl-imx-esdhc: add set tuning start point binding
mmc: sdhci: add standard hw auto retuning support
mmc: sdhci-esdhc-imx: enable hw auto retuning for STD_TUNING
mmc: sdhci-esdhc-imx: enable hw auto retuning for MAN_TUNING
mmc: sdhci-esdhc-imx: fix strobe DLL lock wrong clock issue
mmc: sdhci-esdhc-imx: factor out hw related initialization into
function
mmc: sdhci-esdhc-imx: move tuning static configuration into hwinit
function
mmc: sdhci-esdhci-imx: re-initialize hw state after resume
mmc: sdhci-esdhc-imx: clear tuning bits during driver probe

 .../devicetree/bindings/mmc/fsl-imx-esdhc.txt      |   2 +
 drivers/mmc/host/sdhci-esdhc-imx.c                 | 149 ++++++++++++++-------
 drivers/mmc/host/sdhci.c                           |  24 ++--
 drivers/mmc/host/sdhci.h                           |   3 +
 include/linux/platform_data/mmc-esdhc-imx.h        |   1 +
 5 files changed, 122 insertions(+), 57 deletions(-)

--
1.9.1