2022-11-30 12:37:52

by Wenchao Chen

[permalink] [raw]
Subject: [PATCH V2] mmc: sdhci-sprd: Fix no reset data and command after voltage switch

After switching the voltage, no reset data and command will cause
CMD2 timeout.

Fixes: 29ca763fc26f ("mmc: sdhci-sprd: Add pin control support for voltage switch")
Signed-off-by: Wenchao Chen <[email protected]>
---
Changelog:

v1 -> v2:
There is no need to wait for the state of the pin to stabilize.
---
drivers/mmc/host/sdhci-sprd.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c
index b92a408f138d..bec3f9e3cd3f 100644
--- a/drivers/mmc/host/sdhci-sprd.c
+++ b/drivers/mmc/host/sdhci-sprd.c
@@ -470,7 +470,7 @@ static int sdhci_sprd_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios)
}

if (IS_ERR(sprd_host->pinctrl))
- return 0;
+ goto reset;

switch (ios->signal_voltage) {
case MMC_SIGNAL_VOLTAGE_180:
@@ -498,6 +498,8 @@ static int sdhci_sprd_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios)

/* Wait for 300 ~ 500 us for pin state stable */
usleep_range(300, 500);
+
+reset:
sdhci_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);

return 0;
--
2.17.1


2022-11-30 15:50:11

by Adrian Hunter

[permalink] [raw]
Subject: Re: [PATCH V2] mmc: sdhci-sprd: Fix no reset data and command after voltage switch

On 30/11/22 14:13, Wenchao Chen wrote:
> After switching the voltage, no reset data and command will cause
> CMD2 timeout.
>
> Fixes: 29ca763fc26f ("mmc: sdhci-sprd: Add pin control support for voltage switch")
> Signed-off-by: Wenchao Chen <[email protected]>

Acked-by: Adrian Hunter <[email protected]>

> ---
> Changelog:
>
> v1 -> v2:
> There is no need to wait for the state of the pin to stabilize.
> ---
> drivers/mmc/host/sdhci-sprd.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c
> index b92a408f138d..bec3f9e3cd3f 100644
> --- a/drivers/mmc/host/sdhci-sprd.c
> +++ b/drivers/mmc/host/sdhci-sprd.c
> @@ -470,7 +470,7 @@ static int sdhci_sprd_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios)
> }
>
> if (IS_ERR(sprd_host->pinctrl))
> - return 0;
> + goto reset;
>
> switch (ios->signal_voltage) {
> case MMC_SIGNAL_VOLTAGE_180:
> @@ -498,6 +498,8 @@ static int sdhci_sprd_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios)
>
> /* Wait for 300 ~ 500 us for pin state stable */
> usleep_range(300, 500);
> +
> +reset:
> sdhci_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
>
> return 0;

2022-12-01 02:09:15

by Baolin Wang

[permalink] [raw]
Subject: Re: [PATCH V2] mmc: sdhci-sprd: Fix no reset data and command after voltage switch



On 11/30/2022 8:13 PM, Wenchao Chen wrote:
> After switching the voltage, no reset data and command will cause
> CMD2 timeout.
>
> Fixes: 29ca763fc26f ("mmc: sdhci-sprd: Add pin control support for voltage switch")
> Signed-off-by: Wenchao Chen <[email protected]>

LGTM. Thanks.
Reviewed-by: Baolin Wang <[email protected]>

> ---
> Changelog:
>
> v1 -> v2:
> There is no need to wait for the state of the pin to stabilize.
> ---
> drivers/mmc/host/sdhci-sprd.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c
> index b92a408f138d..bec3f9e3cd3f 100644
> --- a/drivers/mmc/host/sdhci-sprd.c
> +++ b/drivers/mmc/host/sdhci-sprd.c
> @@ -470,7 +470,7 @@ static int sdhci_sprd_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios)
> }
>
> if (IS_ERR(sprd_host->pinctrl))
> - return 0;
> + goto reset;
>
> switch (ios->signal_voltage) {
> case MMC_SIGNAL_VOLTAGE_180:
> @@ -498,6 +498,8 @@ static int sdhci_sprd_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios)
>
> /* Wait for 300 ~ 500 us for pin state stable */
> usleep_range(300, 500);
> +
> +reset:
> sdhci_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
>
> return 0;

2022-12-01 11:18:26

by Ulf Hansson

[permalink] [raw]
Subject: Re: [PATCH V2] mmc: sdhci-sprd: Fix no reset data and command after voltage switch

On Wed, 30 Nov 2022 at 13:14, Wenchao Chen <[email protected]> wrote:
>
> After switching the voltage, no reset data and command will cause
> CMD2 timeout.
>
> Fixes: 29ca763fc26f ("mmc: sdhci-sprd: Add pin control support for voltage switch")
> Signed-off-by: Wenchao Chen <[email protected]>

Applied for fixes and by adding a stable tag, thanks!

Kind regards
Uffe


> ---
> Changelog:
>
> v1 -> v2:
> There is no need to wait for the state of the pin to stabilize.
> ---
> drivers/mmc/host/sdhci-sprd.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c
> index b92a408f138d..bec3f9e3cd3f 100644
> --- a/drivers/mmc/host/sdhci-sprd.c
> +++ b/drivers/mmc/host/sdhci-sprd.c
> @@ -470,7 +470,7 @@ static int sdhci_sprd_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios)
> }
>
> if (IS_ERR(sprd_host->pinctrl))
> - return 0;
> + goto reset;
>
> switch (ios->signal_voltage) {
> case MMC_SIGNAL_VOLTAGE_180:
> @@ -498,6 +498,8 @@ static int sdhci_sprd_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios)
>
> /* Wait for 300 ~ 500 us for pin state stable */
> usleep_range(300, 500);
> +
> +reset:
> sdhci_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
>
> return 0;
> --
> 2.17.1
>