mmc: sdhci: Fix incorrect switch to HS mode
PATCH 1/1 mmc: sdhci: Fix incorrect switch to HS mode
When switching from any MMC speed mode that requires 1.8v (HS200, HS400 and HS400ES) to High Speed (HS) mode, the system ends up configured for SDR12 with a 50MHz clock which is an illegal mode.
This happens because the SDHCI_CTRL_VDD_180 bit in the SDHCI_HOST_CONTROL2 register is left set and when this bit is set, the speed mode is controlled by the SDHCI_CTRL_UHS field in the SDHCI_HOST_CONTROL2 register. The SDHCI_CTRL_UHS field will end up being set to 0 (SDR12) by sdhci_set_uhs_signaling() because there is no UHS mode being set.
The fix is to change sdhci_set_uhs_signaling() to set the SDHCI_CTRL_UHS field to SDR25 (which is the same as HS) for any switch to HS mode.
This was found on a new eMMC controller that does strict checking of the speed mode and the corresponding clock rate. It caused the switch to HS400 mode to fail because part of the sequence to switch to HS400 requires a switch from HS200 to HS before going to HS400.
This fix was suggested by Adrian Hunter
--- drivers/mmc/host/sdhci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci.c +3 -1
@@ -1858,7 +1858,9 @@ void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing) ctrl_2 |=SDHCI_CTRL_UHS_SDR104 ; else if (timing == MMC_TIMING_UHS_SDR12) ctrl_2 |= SDHCI_CTRL_UHS_SDR12; - else if (timing == MMC_TIMING_UHS_SDR25) + else if (timing == MMC_TIMING_SD_HS || + timing == MMC_TIMING_MMC_HS || + timing == MMC_TIMING_UHS_SDR25) ctrl_2 |= SDHCI_CTRL_UHS_SDR25; else if (timing == MMC_TIMING_UHS_SDR50) ctrl_2 |= SDHCI_CTRL_UHS_SDR50;
Signature · 1 line
2.17.1
Quoted 17 lines · Al Cooper
When switching from any MMC speed mode that requires 1.8v (HS200, HS400 and HS400ES) to High Speed (HS) mode, the system ends up configured for SDR12 with a 50MHz clock which is an illegal mode.
This happens because the
SDHCI_CTRL_VDD_180bit in theSDHCI_HOST_CONTROL2register is left set and when this bit is set, the speed mode is controlled by theSDHCI_CTRL_UHSfield in theSDHCI_HOST_CONTROL2register. TheSDHCI_CTRL_UHSfield will end up being set to 0 (SDR12) bysdhci_set_uhs_signaling()because there is no UHS mode being set.The fix is to change
sdhci_set_uhs_signaling()to set theSDHCI_CTRL_UHSfield to SDR25 (which is the same as HS) for any switch to HS mode.
Quoted 8 lines
This was found on a new eMMC controller that does strict checking of the speed mode and the corresponding clock rate. It caused the switch to HS400 mode to fail because part of the sequence to switch to HS400 requires a switch from HS200 to HS before going to HS400.
This fix was suggested by Adrian Hunter
Signed-off-by Al Cooper <[email protected]>
Should this be applied for fixes and tagged for stable you think?
Kind regards
Uffe
Quoted 22 lines
--- drivers/mmc/host/sdhci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/mmc/host/sdhci.c +3
-2@@ -1858,7 +1858,9 @@ void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing) ctrl_2 |=SDHCI_CTRL_UHS_SDR104 ; else if (timing == MMC_TIMING_UHS_SDR12) ctrl_2 |= SDHCI_CTRL_UHS_SDR12; - else if (timing == MMC_TIMING_UHS_SDR25) + else if (timing == MMC_TIMING_SD_HS || + timing == MMC_TIMING_MMC_HS || + timing == MMC_TIMING_UHS_SDR25) ctrl_2 |= SDHCI_CTRL_UHS_SDR25; else if (timing == MMC_TIMING_UHS_SDR50) ctrl_2 |= SDHCI_CTRL_UHS_SDR50; --2.17.1
This does correct the sequence of switching to HS400 but it might be safest to just add this to the latest until it gets a little testing to make sure it doesn't expose some bug in existing controllers.
Thanks
Al
Quoted 55 lines · Ulf Hansson
Quoted 17 lines · Al Cooper
When switching from any MMC speed mode that requires 1.8v (HS200, HS400 and HS400ES) to High Speed (HS) mode, the system ends up configured for SDR12 with a 50MHz clock which is an illegal mode.
This happens because the
SDHCI_CTRL_VDD_180bit in theSDHCI_HOST_CONTROL2register is left set and when this bit is set, the speed mode is controlled by theSDHCI_CTRL_UHSfield in theSDHCI_HOST_CONTROL2register. TheSDHCI_CTRL_UHSfield will end up being set to 0 (SDR12) bysdhci_set_uhs_signaling()because there is no UHS mode being set.The fix is to change
sdhci_set_uhs_signaling()to set theSDHCI_CTRL_UHSfield to SDR25 (which is the same as HS) for any switch to HS mode.Quoted 8 lines
This was found on a new eMMC controller that does strict checking of the speed mode and the corresponding clock rate. It caused the switch to HS400 mode to fail because part of the sequence to switch to HS400 requires a switch from HS200 to HS before going to HS400.
This fix was suggested by Adrian Hunter
Signed-off-by Al Cooper <[email protected]>Should this be applied for fixes and tagged for stable you think?
Kind regards
UffeQuoted 22 lines
--- drivers/mmc/host/sdhci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/mmc/host/sdhci.c +3
-2@@ -1858,7 +1858,9 @@ void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing) ctrl_2 |=SDHCI_CTRL_UHS_SDR104 ; else if (timing == MMC_TIMING_UHS_SDR12) ctrl_2 |= SDHCI_CTRL_UHS_SDR12; - else if (timing == MMC_TIMING_UHS_SDR25) + else if (timing == MMC_TIMING_SD_HS || + timing == MMC_TIMING_MMC_HS || + timing == MMC_TIMING_UHS_SDR25) ctrl_2 |= SDHCI_CTRL_UHS_SDR25; else if (timing == MMC_TIMING_UHS_SDR50) ctrl_2 |= SDHCI_CTRL_UHS_SDR50; --2.17.1
Hi,
Quoted 4 lines · Alan Cooper
This does correct the sequence of switching to HS400 but it might be safest to just add this to the latest until it gets a little testing to make sure it doesn't expose some bug in existing controllers.
Quoted 22 lines
Thanks
AlQuoted 18 lines · Ulf Hansson
Quoted 16 lines · Al Cooper
When switching from any MMC speed mode that requires 1.8v (HS200, HS400 and HS400ES) to High Speed (HS) mode, the system ends up configured for SDR12 with a 50MHz clock which is an illegal mode.
This happens because the
SDHCI_CTRL_VDD_180bit in theSDHCI_HOST_CONTROL2register is left set and when this bit is set, the speed mode is controlled by theSDHCI_CTRL_UHSfield in theSDHCI_HOST_CONTROL2register. TheSDHCI_CTRL_UHSfield will end up being set to 0 (SDR12) bysdhci_set_uhs_signaling()because there is no UHS mode being set.The fix is to change
sdhci_set_uhs_signaling()to set theSDHCI_CTRL_UHSfield to SDR25 (which is the same as HS) for any switch to HS mode.
This change has broken High speed mode in SD card for me in AM65x-evm. I guess this change only needs to be done for eMMC. SDR25 is decidedly not the same as high speed for SD card.
Thanks,
Faiz
Adrian Hunter
maintainerQuoted 26 lines · Faiz Abbas
Hi,
Quoted 23 lines · Alan Cooper
This does correct the sequence of switching to HS400 but it might be safest to just add this to the latest until it gets a little testing to make sure it doesn't expose some bug in existing controllers.
Thanks
AlQuoted 15 lines · Ulf Hansson
Quoted 13 lines · Al Cooper
When switching from any MMC speed mode that requires 1.8v (HS200, HS400 and HS400ES) to High Speed (HS) mode, the system ends up configured for SDR12 with a 50MHz clock which is an illegal mode.
This happens because the
SDHCI_CTRL_VDD_180bit in theSDHCI_HOST_CONTROL2register is left set and when this bit is set, the speed mode is controlled by theSDHCI_CTRL_UHSfield in theSDHCI_HOST_CONTROL2register. TheSDHCI_CTRL_UHSfield will end up being set to 0 (SDR12) bysdhci_set_uhs_signaling()because there is no UHS mode being set.
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
The fix is to change
sdhci_set_uhs_signaling()to set theSDHCI_CTRL_UHSfield to SDR25 (which is the same as HS) for any switch to HS mode.This change has broken High speed mode in SD card for me in AM65x-evm. I guess this change only needs to be done for eMMC. SDR25 is decidedly not the same as high speed for SD card.
Shall we revert c894e33ddc1910e14d6f2a2016f60ab613fd8b37 and then Alan could send a patch providing the desired behaviour in ->set_uhs_signaling() of the relevant driver e.g.
void ???_set_uhs_signaling(struct sdhci_host *host, unsigned int timing)
{
if (timing == MMC_TIMING_SD_HS || timing == MMC_TIMING_MMC_HS)
timing = MMC_TIMING_UHS_SDR25;
sdhci_set_uhs_signaling(host, timing);
}Adrian,
Quoted 39 lines · Adrian Hunter
Quoted 26 lines · Faiz Abbas
Hi,
Quoted 23 lines · Alan Cooper
This does correct the sequence of switching to HS400 but it might be safest to just add this to the latest until it gets a little testing to make sure it doesn't expose some bug in existing controllers.
Thanks
AlQuoted 15 lines · Ulf Hansson
Quoted 13 lines · Al Cooper
When switching from any MMC speed mode that requires 1.8v (HS200, HS400 and HS400ES) to High Speed (HS) mode, the system ends up configured for SDR12 with a 50MHz clock which is an illegal mode.
This happens because the
SDHCI_CTRL_VDD_180bit in theSDHCI_HOST_CONTROL2register is left set and when this bit is set, the speed mode is controlled by theSDHCI_CTRL_UHSfield in theSDHCI_HOST_CONTROL2register. TheSDHCI_CTRL_UHSfield will end up being set to 0 (SDR12) bysdhci_set_uhs_signaling()because there is no UHS mode being set.Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
The fix is to change
sdhci_set_uhs_signaling()to set theSDHCI_CTRL_UHSfield to SDR25 (which is the same as HS) for any switch to HS mode.This change has broken High speed mode in SD card for me in AM65x-evm. I guess this change only needs to be done for eMMC. SDR25 is decidedly not the same as high speed for SD card.
Shall we revert
c894e33ddc1910e14d6f2a2016f60ab613fd8b37and then Alan could send a patch providing the desired behaviour in ->set_uhs_signaling() of the relevant driver e.g.
Quoted 7 lines
void ???_set_uhs_signaling(struct
sdhci_host*host, unsigned int timing){ if (timing == MMC_TIMING_SD_HS || timing == MMC_TIMING_MMC_HS) timing = MMC_TIMING_UHS_SDR25; sdhci_set_uhs_signaling(host, timing); }
Yes. Lets do that. I will send the revert.
Thanks,
Faiz