mmc: sdhci: Fix voltage switch delay
Adrian Hunter
maintainercover mmc: sdhci: Fix voltage switch delay
Hi
Here is a fix for the voltage switch delay issue raised here:
https://lore.kernel.org/linux-mmc/[email protected]/
Plus some subsequent tidy-ups.
Adrian Hunter (4):
mmc: sdhci: Fix voltage switch delay
mmc: sdhci: Avoid unnecessary re-configuration
mmc: sdhci: Avoid unnecessary ->set_clock()
mmc: sdhci: Enable card clock instead of ->set_clock()
drivers/mmc/host/sdhci.c | 91 +++++++++++++++++++++++++++++++----------------- drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 61 insertions(+), 32 deletions(-)
Regards
Adrian
Adrian Hunter
maintainerPATCH 1/4 mmc: sdhci: Fix voltage switch delay
Commit 20b92a30b561 ("mmc: sdhci: update signal voltage switch code") removed voltage switch delays from sdhci because mmc core had been enhanced to support them. However that assumed that sdhci_set_ios() did a single clock change, which it did not, and so the delays in mmc core, which should have come after the first clock change, were not effective.
Fix by avoiding re-configuring UHS and preset settings when the clock is turning on and the settings have not changed. That then also avoids the associated clock changes, so that then sdhci_set_ios() does a single clock change when voltage switching, and the mmc core delays become effective.
To do that has meant keeping track of driver strength (host->drv_type), and cases of reinitialization (host->reinit_uhs).
Note also, the 'turning_on_clk' restriction should not be necessary but is done to minimize the impact of the change on stable kernels.
--- drivers/mmc/host/sdhci.c | 51 ++++++++++++++++++++++++++++++++++------ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 46 insertions(+), 7 deletions(-)
drivers/mmc/host/sdhci.c +44 -7
@@ -373,6 +373,7 @@ static void sdhci_init(struct sdhci_host *host, int soft)if (soft) {/* force clock reconfiguration */ host->clock =0 ; + host->reinit_uhs = true; mmc->ops->set_ios (mmc, &mmc->ios); } }
@@ -2279,11 +2280,35 @@ void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing) }EXPORT_SYMBOL_GPL (sdhci_set_uhs_signaling); +static bool sdhci_timing_has_preset (unsigned char timing) +{ +switch (timing) { +case MMC_TIMING_UHS_SDR12 : +case MMC_TIMING_UHS_SDR25 : +case MMC_TIMING_UHS_SDR50 : +case MMC_TIMING_UHS_SDR104 : +case MMC_TIMING_UHS_DDR50 : +case MMC_TIMING_MMC_DDR52 : +return true; + }; +return false; +} + +static bool sdhci_preset_needed (struct sdhci_host *host,unsigned char timing) +{ +return !(host->quirks2 &SDHCI_QUIRK2_PRESET_VALUE_BROKEN ) && +sdhci_timing_has_preset (timing); +} +void sdhci_set_ios (struct mmc_host *mmc,struct mmc_ios *ios) {struct sdhci_host *host =mmc_priv (mmc); +bool reinit_uhs = host->reinit_uhs; +bool turning_on_clk = false;u8 ctrl; + host->reinit_uhs = false; +if (ios->power_mode ==MMC_POWER_UNDEFINED )return ;
@@ -2309,6 +2334,8 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)sdhci_enable_preset_value (host, false);if (!ios->clock || ios->clock != host->clock) { + turning_on_clk = ios->clock && !host->clock; + host->ops->set_clock (host, ios->clock); host->clock = ios->clock;
@@ -2335,6 +2362,18 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->ops->set_bus_width (host, ios->bus_width); +/* +* Special case to avoid multiple clock changes during voltage +* switching. +*/ +if (!reinit_uhs && + turning_on_clk && + host->timing == ios->timing && + host->version >=SDHCI_SPEC_300 && + (host->preset_enabled || host->drv_type == ios->drv_type) && + (host->preset_enabled || !sdhci_preset_needed (host, ios->timing))) +return ; + ctrl =sdhci_readb (host,SDHCI_HOST_CONTROL );if (!(host->quirks &SDHCI_QUIRK_NO_HISPD_BIT )) {
@@ -2378,6 +2417,7 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) }sdhci_writew (host, ctrl_2,SDHCI_HOST_CONTROL2 ); + host->drv_type = ios->drv_type; }else {/* * According to SDHC Spec v3.00, if the Preset Value
@@ -2405,19 +2445,14 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->ops->set_uhs_signaling (host, ios->timing); host->timing = ios->timing; -if (!(host->quirks2 &SDHCI_QUIRK2_PRESET_VALUE_BROKEN ) && - ((ios->timing ==MMC_TIMING_UHS_SDR12 ) || - (ios->timing ==MMC_TIMING_UHS_SDR25 ) || - (ios->timing ==MMC_TIMING_UHS_SDR50 ) || - (ios->timing ==MMC_TIMING_UHS_SDR104 ) || - (ios->timing ==MMC_TIMING_UHS_DDR50 ) || - (ios->timing ==MMC_TIMING_MMC_DDR52 ))) { +if (sdhci_preset_needed (host, ios->timing)) {u16 preset;sdhci_enable_preset_value (host, true); preset =sdhci_get_preset_value (host); ios->drv_type =FIELD_GET (SDHCI_PRESET_DRV_MASK , preset); + host->drv_type = ios->drv_type; }/* Re-enable SD Clock */
@@ -3754,6 +3789,7 @@ int sdhci_resume_host(struct sdhci_host *host)sdhci_init (host,0 ); host->pwr =0 ; host->clock =0 ; + host->reinit_uhs = true; mmc->ops->set_ios (mmc, &mmc->ios); }else {sdhci_init (host, (mmc->pm_flags &MMC_PM_KEEP_POWER ));
@@ -3816,6 +3852,7 @@ int sdhci_runtime_resume_host(struct sdhci_host *host, int soft_reset)/* Force clock and power re-program */ host->pwr =0 ; host->clock =0 ; + host->reinit_uhs = true; mmc->ops->start_signal_voltage_switch (mmc, &mmc->ios); mmc->ops->set_ios (mmc, &mmc->ios);
drivers/mmc/host/sdhci.h +2 -0
@@ -524,6 +524,8 @@ struct sdhci_host {unsigned int clock;/* Current clock (MHz) */ u8 pwr;/* Current voltage */ +u8 drv_type;/* Current UHS-I driver type */ +bool reinit_uhs;/* Force UHS-related re-initialization */ bool runtime_suspended;/* Host is runtime suspended */ bool bus_on;/* Bus power prevents runtime suspend */
Signature · 1 line
2.34.1
Quoted 32 lines
-----Original Message-----
From: Adrian Hunter <[email protected]>
Sent: 2022年11月25日 1:07
To: Ulf Hansson <[email protected]>
Cc: Sarthak Garg <[email protected]>; Florian Fainelli <[email protected]>; Al Cooper <[email protected]>; Bough Chen <[email protected]>; Andrew Jeffery <[email protected]>; Eugen Hristev <[email protected]>; Vignesh Raghavendra <[email protected]>; Prabu Thangamuthu <[email protected]>; Manjunath M B <[email protected]>; Ben Dooks <[email protected]>; Jaehoon Chung <[email protected]>; Viresh Kumar <[email protected]>; Thierry Reding <[email protected]>; Hu Ziji <[email protected]>; Wolfram Sang <[email protected]>; Sascha Hauer <[email protected]>; Brian Norris <[email protected]>; Wenchao Chen <[email protected]>; Chevron Li <[email protected]>; [email protected]
Subject: [PATCH 1/4] mmc: sdhci: Fix voltage switch delayCommit
20b92a30b561("mmc: sdhci: update signal voltage switch code") removed voltage switch delays from sdhci because mmc core had been enhanced to support them. However that assumed thatsdhci_set_ios()did a single clock change, which it did not, and so the delays in mmc core, which should have come after the first clock change, were not effective.Fix by avoiding re-configuring UHS and preset settings when the clock is turning on and the settings have not changed. That then also avoids the associated clock changes, so that then
sdhci_set_ios()does a single clock change when voltage switching, and the mmc core delays become effective.To do that has meant keeping track of driver strength (
host->drv_type), and cases of reinitialization (host->reinit_uhs).
Quoted 6 lines
Note also, the '
turning_on_clk' restriction should not be necessary but is done to minimize the impact of the change on stable kernels.Fixes 20b92a30b561 ("mmc: sdhci: update signal voltage switch code")Signed-off-by Adrian Hunter <[email protected]>
Hi Adrian,
These patch set take care of the card clock on/off by CARD_EN bit, but for the USDHC on i.MX series, it do not implement these bits. Instead, it use another bit named force_clk_on to gate on/off the card clock. So logically, USDHC do not has this issue.
I apply your patch and did a quick test on i.MX platform, do not find any side effect.
So for the patch set:
Best Regards
Haibo Chen
Quoted 142 lines
--- drivers/mmc/host/sdhci.c | 51 ++++++++++++++++++++++++++++++++++------ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 46 insertions(+), 7 deletions(-)drivers/mmc/host/sdhci.c index renamed from drivers/mmc/host/sdhci.c +0
-0
2108e8075609..351b09b90d76100644drivers/mmc/host/sdhci.c +37
-0@@ -373,6 +373,7 @@ static void sdhci_init(struct sdhci_host *host, int soft)if (soft) {/* force clock reconfiguration */ host->clock =0 ; + host->reinit_uhs = true; mmc->ops->set_ios (mmc, &mmc->ios); } }@@ -2279,11 +2280,35 @@ void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing) } EXPORT_SYMBOL_GPL(sdhci_set_uhs_signaling); +static bool sdhci_timing_has_preset (unsigned char timing) { +switch (timing) { +case MMC_TIMING_UHS_SDR12 : +case MMC_TIMING_UHS_SDR25 : +case MMC_TIMING_UHS_SDR50 : +case MMC_TIMING_UHS_SDR104 : +case MMC_TIMING_UHS_DDR50 : +case MMC_TIMING_MMC_DDR52 : +return true; + }; +return false; +} + +static bool sdhci_preset_needed (struct sdhci_host *host,unsigned char +timing) { +return !(host->quirks2 &SDHCI_QUIRK2_PRESET_VALUE_BROKEN ) && +sdhci_timing_has_preset (timing); } +void sdhci_set_ios (struct mmc_host *mmc,struct mmc_ios *ios) {struct sdhci_host *host =mmc_priv (mmc); +bool reinit_uhs = host->reinit_uhs; +bool turning_on_clk = false;u8 ctrl; + host->reinit_uhs = false; +if (ios->power_mode ==MMC_POWER_UNDEFINED )return ;@@ -2309,6 +2334,8 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)sdhci_enable_preset_value (host ,false );if (!ios->clock || ios->clock != host->clock) { + turning_on_clk = ios->clock && !host->clock; + host->ops->set_clock (host, ios->clock); host->clock = ios->clock;@@ -2335,6 +2362,18 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->ops->set_bus_width(host, ios->bus_width); +/* +* Special case to avoid multiple clock changes during voltage +* switching. +*/ +if (!reinit_uhs && + turning_on_clk && + host->timing == ios->timing && + host->version >=SDHCI_SPEC_300 && + (host->preset_enabled || host->drv_type == ios->drv_type) && + (host->preset_enabled || !sdhci_preset_needed (host, ios->timing))) +return ; + ctrl =sdhci_readb (host,SDHCI_HOST_CONTROL );if (!(host->quirks &
SDHCI_QUIRK_NO_HISPD_BIT)) { @@ -2378,6 +2417,7
@@ voidsdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)drivers/mmc/host/sdhci.c +1
-1}sdhci_writew (host, ctrl_2,SDHCI_HOST_CONTROL2 ); + host->drv_type = ios->drv_type; }else {/* * According to SDHC Spec v3.00, if the Preset Value @@ -2405,19 +2445,14 @@ void sdhci_set_ios(struct mmc_host *mmc, struct
mmc_ios*ios)drivers/mmc/host/sdhci.c +3
-8host->ops->set_uhs_signaling (host, ios->timing); host->timing = ios->timing; -if (!(host->quirks2 &SDHCI_QUIRK2_PRESET_VALUE_BROKEN ) && - ((ios->timing ==MMC_TIMING_UHS_SDR12 ) || - (ios->timing ==MMC_TIMING_UHS_SDR25 ) || - (ios->timing ==MMC_TIMING_UHS_SDR50 ) || - (ios->timing ==MMC_TIMING_UHS_SDR104 ) || - (ios->timing ==MMC_TIMING_UHS_DDR50 ) || - (ios->timing ==MMC_TIMING_MMC_DDR52 ))) { +if (sdhci_preset_needed (host, ios->timing)) {u16 preset;sdhci_enable_preset_value (host, true); preset =sdhci_get_preset_value (host); ios->drv_type =FIELD_GET (SDHCI_PRESET_DRV_MASK , preset); + host->drv_type = ios->drv_type; }/* Re-enable SD Clock */ @@ -3754,6 +3789,7 @@ int sdhci_resume_host(struct sdhci_host *host)sdhci_init (host,0 ); host->pwr =0 ; host->clock =0 ; + host->reinit_uhs = true; mmc->ops->set_ios (mmc, &mmc->ios); }else { sdhci_init(host, (mmc->pm_flags & MMC_PM_KEEP_POWER)); @@ -3816,6 +3852,7 @@ int sdhci_runtime_resume_host(struct sdhci_host *host,int
soft_reset)drivers/mmc/host/sdhci.c +1
-0/* Force clock and power re-program */ host->pwr =0 ; host->clock =0 ; + host->reinit_uhs = true; mmc->ops->start_signal_voltage_switch (mmc, &mmc->ios); mmc->ops->set_ios (mmc, &mmc->ios);drivers/mmc/host/sdhci.h index renamed from drivers/mmc/host/sdhci.h +0
-0
908da47ac5ba..b6f31a7d6152100644drivers/mmc/host/sdhci.h +2
-1@@ -524,6 +524,8 @@ struct sdhci_host {unsigned int clock;/* Current clock (MHz) */ u8 pwr;/* Current voltage */ +u8 drv_type;/* Current UHS-I driver type */ +bool reinit_uhs;/* Force UHS-related re-initialization */ bool runtime_suspended;/* Host is runtime suspended */ bool bus_on;/* Bus power prevents runtime suspend */ --2.34.1
Adrian Hunter
maintainerQuoted 39 lines · Bough Chen
Quoted 32 lines
-----Original Message-----
From: Adrian Hunter <[email protected]>
Sent: 2022年11月25日 1:07
To: Ulf Hansson <[email protected]>
Cc: Sarthak Garg <[email protected]>; Florian Fainelli <[email protected]>; Al Cooper <[email protected]>; Bough Chen <[email protected]>; Andrew Jeffery <[email protected]>; Eugen Hristev <[email protected]>; Vignesh Raghavendra <[email protected]>; Prabu Thangamuthu <[email protected]>; Manjunath M B <[email protected]>; Ben Dooks <[email protected]>; Jaehoon Chung <[email protected]>; Viresh Kumar <[email protected]>; Thierry Reding <[email protected]>; Hu Ziji <[email protected]>; Wolfram Sang <[email protected]>; Sascha Hauer <[email protected]>; Brian Norris <[email protected]>; Wenchao Chen <[email protected]>; Chevron Li <[email protected]>; [email protected]
Subject: [PATCH 1/4] mmc: sdhci: Fix voltage switch delayCommit
20b92a30b561("mmc: sdhci: update signal voltage switch code") removed voltage switch delays from sdhci because mmc core had been enhanced to support them. However that assumed thatsdhci_set_ios()did a single clock change, which it did not, and so the delays in mmc core, which should have come after the first clock change, were not effective.Fix by avoiding re-configuring UHS and preset settings when the clock is turning on and the settings have not changed. That then also avoids the associated clock changes, so that then
sdhci_set_ios()does a single clock change when voltage switching, and the mmc core delays become effective.To do that has meant keeping track of driver strength (
host->drv_type), and cases of reinitialization (host->reinit_uhs).Quoted 6 lines
Note also, the '
turning_on_clk' restriction should not be necessary but is done to minimize the impact of the change on stable kernels.Fixes 20b92a30b561 ("mmc: sdhci: update signal voltage switch code")Signed-off-by Adrian Hunter <[email protected]>
Quoted 8 lines
Hi Adrian,
These patch set take care of the card clock on/off by
CARD_ENbit, but for the USDHC on i.MX series, it do not implement these bits. Instead, it use another bit namedforce_clk_onto gate on/off the card clock. So logically, USDHC do not has this issue.
I apply your patch and did a quick test on i.MX platform, do not find any side effect.So for the patch set:
Tested-by Haibo Chen <[email protected]>
Thanks for testings this!
Quoted 146 lines
Best Regards
Haibo ChenQuoted 142 lines
--- drivers/mmc/host/sdhci.c | 51 ++++++++++++++++++++++++++++++++++------ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 46 insertions(+), 7 deletions(-)drivers/mmc/host/sdhci.c index renamed from drivers/mmc/host/sdhci.c +0
-0
2108e8075609..351b09b90d76100644drivers/mmc/host/sdhci.c +37
-0@@ -373,6 +373,7 @@ static void sdhci_init(struct sdhci_host *host, int soft)if (soft) {/* force clock reconfiguration */ host->clock =0 ; + host->reinit_uhs = true; mmc->ops->set_ios (mmc, &mmc->ios); } }@@ -2279,11 +2280,35 @@ void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing) } EXPORT_SYMBOL_GPL(sdhci_set_uhs_signaling); +static bool sdhci_timing_has_preset (unsigned char timing) { +switch (timing) { +case MMC_TIMING_UHS_SDR12 : +case MMC_TIMING_UHS_SDR25 : +case MMC_TIMING_UHS_SDR50 : +case MMC_TIMING_UHS_SDR104 : +case MMC_TIMING_UHS_DDR50 : +case MMC_TIMING_MMC_DDR52 : +return true; + }; +return false; +} + +static bool sdhci_preset_needed (struct sdhci_host *host,unsigned char +timing) { +return !(host->quirks2 &SDHCI_QUIRK2_PRESET_VALUE_BROKEN ) && +sdhci_timing_has_preset (timing); } +void sdhci_set_ios (struct mmc_host *mmc,struct mmc_ios *ios) {struct sdhci_host *host =mmc_priv (mmc); +bool reinit_uhs = host->reinit_uhs; +bool turning_on_clk = false;u8 ctrl; + host->reinit_uhs = false; +if (ios->power_mode ==MMC_POWER_UNDEFINED )return ;@@ -2309,6 +2334,8 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)sdhci_enable_preset_value (host ,false );if (!ios->clock || ios->clock != host->clock) { + turning_on_clk = ios->clock && !host->clock; + host->ops->set_clock (host, ios->clock); host->clock = ios->clock;@@ -2335,6 +2362,18 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->ops->set_bus_width(host, ios->bus_width); +/* +* Special case to avoid multiple clock changes during voltage +* switching. +*/ +if (!reinit_uhs && + turning_on_clk && + host->timing == ios->timing && + host->version >=SDHCI_SPEC_300 && + (host->preset_enabled || host->drv_type == ios->drv_type) && + (host->preset_enabled || !sdhci_preset_needed (host, ios->timing))) +return ; + ctrl =sdhci_readb (host,SDHCI_HOST_CONTROL );if (!(host->quirks &
SDHCI_QUIRK_NO_HISPD_BIT)) { @@ -2378,6 +2417,7
@@ voidsdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)drivers/mmc/host/sdhci.c +1
-1}sdhci_writew (host, ctrl_2,SDHCI_HOST_CONTROL2 ); + host->drv_type = ios->drv_type; }else {/* * According to SDHC Spec v3.00, if the Preset Value @@ -2405,19 +2445,14 @@ void sdhci_set_ios(struct mmc_host *mmc, struct
mmc_ios*ios)drivers/mmc/host/sdhci.c +3
-8host->ops->set_uhs_signaling (host, ios->timing); host->timing = ios->timing; -if (!(host->quirks2 &SDHCI_QUIRK2_PRESET_VALUE_BROKEN ) && - ((ios->timing ==MMC_TIMING_UHS_SDR12 ) || - (ios->timing ==MMC_TIMING_UHS_SDR25 ) || - (ios->timing ==MMC_TIMING_UHS_SDR50 ) || - (ios->timing ==MMC_TIMING_UHS_SDR104 ) || - (ios->timing ==MMC_TIMING_UHS_DDR50 ) || - (ios->timing ==MMC_TIMING_MMC_DDR52 ))) { +if (sdhci_preset_needed (host, ios->timing)) {u16 preset;sdhci_enable_preset_value (host, true); preset =sdhci_get_preset_value (host); ios->drv_type =FIELD_GET (SDHCI_PRESET_DRV_MASK , preset); + host->drv_type = ios->drv_type; }/* Re-enable SD Clock */ @@ -3754,6 +3789,7 @@ int sdhci_resume_host(struct sdhci_host *host)sdhci_init (host,0 ); host->pwr =0 ; host->clock =0 ; + host->reinit_uhs = true; mmc->ops->set_ios (mmc, &mmc->ios); }else { sdhci_init(host, (mmc->pm_flags & MMC_PM_KEEP_POWER)); @@ -3816,6 +3852,7 @@ int sdhci_runtime_resume_host(struct sdhci_host *host,int
soft_reset)drivers/mmc/host/sdhci.c +1
-0/* Force clock and power re-program */ host->pwr =0 ; host->clock =0 ; + host->reinit_uhs = true; mmc->ops->start_signal_voltage_switch (mmc, &mmc->ios); mmc->ops->set_ios (mmc, &mmc->ios);drivers/mmc/host/sdhci.h index renamed from drivers/mmc/host/sdhci.h +0
-0
908da47ac5ba..b6f31a7d6152100644drivers/mmc/host/sdhci.h +2
-1@@ -524,6 +524,8 @@ struct sdhci_host {unsigned int clock;/* Current clock (MHz) */ u8 pwr;/* Current voltage */ +u8 drv_type;/* Current UHS-I driver type */ +bool reinit_uhs;/* Force UHS-related re-initialization */ bool runtime_suspended;/* Host is runtime suspended */ bool bus_on;/* Bus power prevents runtime suspend */ --2.34.1
Quoted 23 lines · Adrian Hunter
Commit
20b92a30b561("mmc: sdhci: update signal voltage switch code") removed voltage switch delays from sdhci because mmc core had been enhanced to support them. However that assumed thatsdhci_set_ios()did a single clock change, which it did not, and so the delays in mmc core, which should have come after the first clock change, were not effective.Fix by avoiding re-configuring UHS and preset settings when the clock is turning on and the settings have not changed. That then also avoids the associated clock changes, so that then
sdhci_set_ios()does a single clock change when voltage switching, and the mmc core delays become effective.To do that has meant keeping track of driver strength (
host->drv_type), and cases of reinitialization (host->reinit_uhs).Note also, the '
turning_on_clk' restriction should not be necessary but is done to minimize the impact of the change on stable kernels.Fixes 20b92a30b561 ("mmc: sdhci: update signal voltage switch code")Signed-off-by Adrian Hunter <[email protected]>
[...]
Quoted 4 lines
drivers/mmc/host/sdhci.c +0
-0@@ -2335,6 +2362,18 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->ops->set_bus_width (host, ios->bus_width);
drivers/mmc/host/sdhci.c void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) · line 2374
Quoted 10 lines
drivers/mmc/host/sdhci.c +10
-0+/* +* Special case to avoid multiple clock changes during voltage +* switching. +*/ +if (!reinit_uhs && + turning_on_clk && + host->timing == ios->timing && + host->version >=SDHCI_SPEC_300 && + (host->preset_enabled || host->drv_type == ios->drv_type) && + (host->preset_enabled || !sdhci_preset_needed (host, ios->timing)))
This caught my eyes, as it looks a bit messy. Not sure if it's possible to simplify, but the last two lines could be replaced with:
(host->preset_enabled ||
(host->drv_type == ios->drv_type && !sdhci_preset_needed(host, ios->timing))))
But, I am not sure that really helps...
[...]
Kind regards
Uffe
Quoted 164 lines · Adrian Hunter
Commit
20b92a30b561("mmc: sdhci: update signal voltage switch code") removed voltage switch delays from sdhci because mmc core had been enhanced to support them. However that assumed thatsdhci_set_ios()did a single clock change, which it did not, and so the delays in mmc core, which should have come after the first clock change, were not effective.Fix by avoiding re-configuring UHS and preset settings when the clock is turning on and the settings have not changed. That then also avoids the associated clock changes, so that then
sdhci_set_ios()does a single clock change when voltage switching, and the mmc core delays become effective.To do that has meant keeping track of driver strength (
host->drv_type), and cases of reinitialization (host->reinit_uhs).Note also, the '
turning_on_clk' restriction should not be necessary but is done to minimize the impact of the change on stable kernels.Fixes 20b92a30b561 ("mmc: sdhci: update signal voltage switch code")Signed-off-by Adrian Hunter <[email protected]>--- drivers/mmc/host/sdhci.c | 51 ++++++++++++++++++++++++++++++++++------ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 46 insertions(+), 7 deletions(-)drivers/mmc/host/sdhci.c +44
-7@@ -373,6 +373,7 @@ static void sdhci_init(struct sdhci_host *host, int soft)if (soft) {/* force clock reconfiguration */ host->clock =0 ; + host->reinit_uhs = true; mmc->ops->set_ios (mmc, &mmc->ios); } }@@ -2279,11 +2280,35 @@ void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing) }EXPORT_SYMBOL_GPL (sdhci_set_uhs_signaling); +static bool sdhci_timing_has_preset (unsigned char timing) +{ +switch (timing) { +case MMC_TIMING_UHS_SDR12 : +case MMC_TIMING_UHS_SDR25 : +case MMC_TIMING_UHS_SDR50 : +case MMC_TIMING_UHS_SDR104 : +case MMC_TIMING_UHS_DDR50 : +case MMC_TIMING_MMC_DDR52 : +return true; + }; +return false; +} + +static bool sdhci_preset_needed (struct sdhci_host *host,unsigned char timing) +{ +return !(host->quirks2 &SDHCI_QUIRK2_PRESET_VALUE_BROKEN ) && +sdhci_timing_has_preset (timing); +} +void sdhci_set_ios (struct mmc_host *mmc,struct mmc_ios *ios) {struct sdhci_host *host =mmc_priv (mmc); +bool reinit_uhs = host->reinit_uhs; +bool turning_on_clk = false;u8 ctrl; + host->reinit_uhs = false; +if (ios->power_mode ==MMC_POWER_UNDEFINED )return ;@@ -2309,6 +2334,8 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)sdhci_enable_preset_value (host, false);if (!ios->clock || ios->clock != host->clock) { + turning_on_clk = ios->clock && !host->clock; + host->ops->set_clock (host, ios->clock); host->clock = ios->clock;@@ -2335,6 +2362,18 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->ops->set_bus_width (host, ios->bus_width); +/* +* Special case to avoid multiple clock changes during voltage +* switching. +*/ +if (!reinit_uhs && + turning_on_clk && + host->timing == ios->timing && + host->version >=SDHCI_SPEC_300 && + (host->preset_enabled || host->drv_type == ios->drv_type) && + (host->preset_enabled || !sdhci_preset_needed (host, ios->timing))) +return ; + ctrl =sdhci_readb (host,SDHCI_HOST_CONTROL );if (!(host->quirks &SDHCI_QUIRK_NO_HISPD_BIT )) {@@ -2378,6 +2417,7 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) }sdhci_writew (host, ctrl_2,SDHCI_HOST_CONTROL2 ); + host->drv_type = ios->drv_type; }else {/* * According to SDHC Spec v3.00, if the Preset Value @@ -2405,19 +2445,14 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->ops->set_uhs_signaling (host, ios->timing); host->timing = ios->timing; -if (!(host->quirks2 &SDHCI_QUIRK2_PRESET_VALUE_BROKEN ) && - ((ios->timing ==MMC_TIMING_UHS_SDR12 ) || - (ios->timing ==MMC_TIMING_UHS_SDR25 ) || - (ios->timing ==MMC_TIMING_UHS_SDR50 ) || - (ios->timing ==MMC_TIMING_UHS_SDR104 ) || - (ios->timing ==MMC_TIMING_UHS_DDR50 ) || - (ios->timing ==MMC_TIMING_MMC_DDR52 ))) { +if (sdhci_preset_needed (host, ios->timing)) {u16 preset;sdhci_enable_preset_value (host, true); preset =sdhci_get_preset_value (host); ios->drv_type =FIELD_GET (SDHCI_PRESET_DRV_MASK , preset); + host->drv_type = ios->drv_type; }/* Re-enable SD Clock */ @@ -3754,6 +3789,7 @@ int sdhci_resume_host(struct sdhci_host *host)sdhci_init (host,0 ); host->pwr =0 ; host->clock =0 ; + host->reinit_uhs = true; mmc->ops->set_ios (mmc, &mmc->ios); }else {sdhci_init (host, (mmc->pm_flags &MMC_PM_KEEP_POWER ));@@ -3816,6 +3852,7 @@ int sdhci_runtime_resume_host(struct sdhci_host *host, int soft_reset)/* Force clock and power re-program */ host->pwr =0 ; host->clock =0 ; + host->reinit_uhs = true; mmc->ops->start_signal_voltage_switch (mmc, &mmc->ios); mmc->ops->set_ios (mmc, &mmc->ios);drivers/mmc/host/sdhci.h +2
-1@@ -524,6 +524,8 @@ struct sdhci_host {unsigned int clock;/* Current clock (MHz) */ u8 pwr;/* Current voltage */ +u8 drv_type;/* Current UHS-I driver type */ +bool reinit_uhs;/* Force UHS-related re-initialization */ bool runtime_suspended;/* Host is runtime suspended */ bool bus_on;/* Bus power prevents runtime suspend */ --
Quoted 2 lines
2.34.1
Hi Adrian
If the return value is -EAGAIN, host->reinit_uhs has been set to false, will it affect trying to initialize?
int mmc_host_set_uhs_voltage(struct mmc_host *host)
{
u32 clock;
/*
* During a signal voltage level switch, the clock must be gated
* for 5 ms according to the SD spec
*/
clock = host->ios.clock;host->ios.clock = 0;mmc_set_ios(host);
if (mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180))
return -EAGAIN; //<======= If returned here.
/* Keep clock gated for at least 10 ms, though spec only says 5 ms */ mmc_delay(10);host->ios.clock = clock;mmc_set_ios(host);
return 0;
}
static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, struct mmc_card *oldcard) {
...
retry:
...
host->ios.signal_voltage != MMC_SIGNAL_VOLTAGE_180) {
if (mmc_host_set_uhs_voltage(host) ||
mmc_sd_init_uhs_card(card)) {...
}
Adrian Hunter
maintainerQuoted 162 lines · Wenchao Chen
Quoted 161 lines · Adrian Hunter
Commit
20b92a30b561("mmc: sdhci: update signal voltage switch code") removed voltage switch delays from sdhci because mmc core had been enhanced to support them. However that assumed thatsdhci_set_ios()did a single clock change, which it did not, and so the delays in mmc core, which should have come after the first clock change, were not effective.Fix by avoiding re-configuring UHS and preset settings when the clock is turning on and the settings have not changed. That then also avoids the associated clock changes, so that then
sdhci_set_ios()does a single clock change when voltage switching, and the mmc core delays become effective.To do that has meant keeping track of driver strength (
host->drv_type), and cases of reinitialization (host->reinit_uhs).Note also, the '
turning_on_clk' restriction should not be necessary but is done to minimize the impact of the change on stable kernels.Fixes 20b92a30b561 ("mmc: sdhci: update signal voltage switch code")Signed-off-by Adrian Hunter <[email protected]>--- drivers/mmc/host/sdhci.c | 51 ++++++++++++++++++++++++++++++++++------ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 46 insertions(+), 7 deletions(-)drivers/mmc/host/sdhci.c +44
-7@@ -373,6 +373,7 @@ static void sdhci_init(struct sdhci_host *host, int soft)if (soft) {/* force clock reconfiguration */ host->clock =0 ; + host->reinit_uhs = true; mmc->ops->set_ios (mmc, &mmc->ios); } }@@ -2279,11 +2280,35 @@ void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing) }EXPORT_SYMBOL_GPL (sdhci_set_uhs_signaling); +static bool sdhci_timing_has_preset (unsigned char timing) +{ +switch (timing) { +case MMC_TIMING_UHS_SDR12 : +case MMC_TIMING_UHS_SDR25 : +case MMC_TIMING_UHS_SDR50 : +case MMC_TIMING_UHS_SDR104 : +case MMC_TIMING_UHS_DDR50 : +case MMC_TIMING_MMC_DDR52 : +return true; + }; +return false; +} + +static bool sdhci_preset_needed (struct sdhci_host *host,unsigned char timing) +{ +return !(host->quirks2 &SDHCI_QUIRK2_PRESET_VALUE_BROKEN ) && +sdhci_timing_has_preset (timing); +} +void sdhci_set_ios (struct mmc_host *mmc,struct mmc_ios *ios) {struct sdhci_host *host =mmc_priv (mmc); +bool reinit_uhs = host->reinit_uhs; +bool turning_on_clk = false;u8 ctrl; + host->reinit_uhs = false; +if (ios->power_mode ==MMC_POWER_UNDEFINED )return ;@@ -2309,6 +2334,8 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)sdhci_enable_preset_value (host, false);if (!ios->clock || ios->clock != host->clock) { + turning_on_clk = ios->clock && !host->clock; + host->ops->set_clock (host, ios->clock); host->clock = ios->clock;@@ -2335,6 +2362,18 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->ops->set_bus_width (host, ios->bus_width); +/* +* Special case to avoid multiple clock changes during voltage +* switching. +*/ +if (!reinit_uhs && + turning_on_clk && + host->timing == ios->timing && + host->version >=SDHCI_SPEC_300 && + (host->preset_enabled || host->drv_type == ios->drv_type) && + (host->preset_enabled || !sdhci_preset_needed (host, ios->timing))) +return ; + ctrl =sdhci_readb (host,SDHCI_HOST_CONTROL );if (!(host->quirks &SDHCI_QUIRK_NO_HISPD_BIT )) {@@ -2378,6 +2417,7 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) }sdhci_writew (host, ctrl_2,SDHCI_HOST_CONTROL2 ); + host->drv_type = ios->drv_type; }else {/* * According to SDHC Spec v3.00, if the Preset Value @@ -2405,19 +2445,14 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->ops->set_uhs_signaling (host, ios->timing); host->timing = ios->timing; -if (!(host->quirks2 &SDHCI_QUIRK2_PRESET_VALUE_BROKEN ) && - ((ios->timing ==MMC_TIMING_UHS_SDR12 ) || - (ios->timing ==MMC_TIMING_UHS_SDR25 ) || - (ios->timing ==MMC_TIMING_UHS_SDR50 ) || - (ios->timing ==MMC_TIMING_UHS_SDR104 ) || - (ios->timing ==MMC_TIMING_UHS_DDR50 ) || - (ios->timing ==MMC_TIMING_MMC_DDR52 ))) { +if (sdhci_preset_needed (host, ios->timing)) {u16 preset;sdhci_enable_preset_value (host, true); preset =sdhci_get_preset_value (host); ios->drv_type =FIELD_GET (SDHCI_PRESET_DRV_MASK , preset); + host->drv_type = ios->drv_type; }/* Re-enable SD Clock */ @@ -3754,6 +3789,7 @@ int sdhci_resume_host(struct sdhci_host *host)sdhci_init (host,0 ); host->pwr =0 ; host->clock =0 ; + host->reinit_uhs = true; mmc->ops->set_ios (mmc, &mmc->ios); }else {sdhci_init (host, (mmc->pm_flags &MMC_PM_KEEP_POWER ));@@ -3816,6 +3852,7 @@ int sdhci_runtime_resume_host(struct sdhci_host *host, int soft_reset)/* Force clock and power re-program */ host->pwr =0 ; host->clock =0 ; + host->reinit_uhs = true; mmc->ops->start_signal_voltage_switch (mmc, &mmc->ios); mmc->ops->set_ios (mmc, &mmc->ios);drivers/mmc/host/sdhci.h +2
-0@@ -524,6 +524,8 @@ struct sdhci_host {unsigned int clock;/* Current clock (MHz) */ u8 pwr;/* Current voltage */ +u8 drv_type;/* Current UHS-I driver type */ +bool reinit_uhs;/* Force UHS-related re-initialization */
Quoted 8 lines
Quoted 5 lines
drivers/mmc/host/sdhci.h +0
-1bool runtime_suspended;/* Host is runtime suspended */ bool bus_on;/* Bus power prevents runtime suspend */ --2.34.1
Hi Adrian
If the return value is-EAGAIN,host->reinit_uhshas been set to false, will it affect trying to initialize?
No it is fine.
SDHCI host->reinit_uhs is usually false. It is set on PM / reset paths when the registers can have been reset.
Quoted 33 lines
int
mmc_host_set_uhs_voltage(struct mmc_host *host){
u32 clock;/*
* During a signal voltage level switch, the clock must be gated
* for 5 ms according to the SD spec
*/
clock =host->ios.clock;host->ios.clock= 0;mmc_set_ios(host);if (
mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180))
return-EAGAIN; //<======= If returned here./* Keep clock gated for at least 10 ms, though spec only says 5 ms */
mmc_delay(10);host->ios.clock= clock;mmc_set_ios(host);return 0;
}static int
mmc_sd_init_card(struct mmc_host *host, u32 ocr, struct mmc_card *oldcard){
...
retry:
...host->ios.signal_voltage != MMC_SIGNAL_VOLTAGE_180) { if (mmc_host_set_uhs_voltage(host) || mmc_sd_init_uhs_card(card)) {...
}
Adrian Hunter
maintainerPATCH 2/4 mmc: sdhci: Avoid unnecessary re-configuration
In reply to Adrian HunterAvoid re-configuring UHS and preset settings when the settings have not changed, irrespective of whether the clock is turning on.
--- drivers/mmc/host/sdhci.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/mmc/host/sdhci.c +2 -6
@@ -2304,7 +2304,6 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) {struct sdhci_host *host =mmc_priv (mmc);bool reinit_uhs = host->reinit_uhs; -bool turning_on_clk = false;u8 ctrl; host->reinit_uhs = false;
@@ -2334,8 +2333,6 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)sdhci_enable_preset_value (host, false);if (!ios->clock || ios->clock != host->clock) { - turning_on_clk = ios->clock && !host->clock; - host->ops->set_clock (host, ios->clock); host->clock = ios->clock;
@@ -2363,11 +2360,10 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->ops->set_bus_width (host, ios->bus_width);/* -* Special case to avoid multiple clock changes during voltage -* switching. +* Avoid unnecessary changes. In particular, this avoids multiple clock +* changes during voltage switching. */ if (!reinit_uhs && - turning_on_clk && host->timing == ios->timing && host->version >= SDHCI_SPEC_300 && (host->preset_enabled || host->drv_type == ios->drv_type) &&
Signature · 1 line
2.34.1
Adrian Hunter
maintainerPATCH 3/4 mmc: sdhci: Avoid unnecessary ->set_clock()
In reply to Adrian HunterTo avoid glitches on the clock line, the card clock is disabled when making timing changes. Do not do that separately for HISPD and UHS settings.
--- drivers/mmc/host/sdhci.c | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-)
drivers/mmc/host/sdhci.c +14 -23
@@ -2390,8 +2390,21 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)if (host->version >=SDHCI_SPEC_300 ) {u16 clk, ctrl_2; +/* +* According to SDHCI Spec v3.00, if the Preset Value +* Enable in the Host Control 2 register is set, we +* need to reset SD Clock Enable before changing High +* Speed Enable to avoid generating clock glitches. +*/ + clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); +if (clk &SDHCI_CLOCK_CARD_EN ) { + clk &= ~SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, clk,SDHCI_CLOCK_CONTROL ); + } + +sdhci_writeb (host, ctrl,SDHCI_HOST_CONTROL ); +if (!host->preset_enabled) { -sdhci_writeb (host, ctrl,SDHCI_HOST_CONTROL );/* * We only need to set Driver Strength if the * preset value enable is not set.
@@ -2414,30 +2427,8 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)sdhci_writew (host, ctrl_2,SDHCI_HOST_CONTROL2 ); host->drv_type = ios->drv_type; - }else { -/* -* According to SDHC Spec v3.00, if the Preset Value -* Enable in the Host Control 2 register is set, we -* need to reset SD Clock Enable before changing High -* Speed Enable to avoid generating clock gliches. -*/ - -/* Reset SD Clock Enable */ - clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); - clk &= ~SDHCI_CLOCK_CARD_EN ; -sdhci_writew (host, clk,SDHCI_CLOCK_CONTROL ); - -sdhci_writeb (host, ctrl,SDHCI_HOST_CONTROL ); - -/* Re-enable SD Clock */ - host->ops->set_clock (host, host->clock); } -/* Reset SD Clock Enable */ - clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); - clk &= ~SDHCI_CLOCK_CARD_EN ; -sdhci_writew (host, clk,SDHCI_CLOCK_CONTROL ); - host->ops->set_uhs_signaling (host, ios->timing); host->timing = ios->timing;
Signature · 1 line
2.34.1
Adrian Hunter
maintainerPATCH 4/4 mmc: sdhci: Enable card clock instead of ->set_clock()
In reply to Adrian HunterSDHCI has separate controls for the internal clock and enabling the clock signal to the card.
The card clock signal was disabled via SDHCI_CLOCK_CARD_EN to avoid glitches on the clock line. It is not necessary to reset the internal clock to re-enable it. Instead re-enable by re-asserting SDHCI_CLOCK_CARD_EN.
--- drivers/mmc/host/sdhci.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci.c +5 -2
@@ -2442,8 +2442,11 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->drv_type = ios->drv_type; } -/* Re-enable SD Clock */ - host->ops->set_clock (host, host->clock); +if (ios->clock) { + clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); + clk |=SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, clk,SDHCI_CLOCK_CONTROL ); + } }else sdhci_writeb (host, ctrl,SDHCI_HOST_CONTROL ); }
Signature · 1 line
2.34.1