mmc: sdhci: Fix HISPD bit handling
Subsystems (2)
PATCH 1/1 mmc: sdhci: Fix HISPD bit handling
SDHCI HISPD bits need to be configured based on desired mmc timings mode and some HISPD quirks.
So, handle the HISPD bit based on the mmc computed selected mode(timing parameter) rather than fixed mmc card clock frequency.
Linux handle the HISPD similar like this in below commit,
commit <501639bf2173> ("mmc: sdhci: fix SDHCI_QUIRK_NO_HISPD_BIT handling")
This eventually fixed the mmc write issue observed in rk3399 sdhci controller.
Bug log for refernece,
=> gpt write mmc 0 $partitions
Writing GPT: mmc write failed
** Can't write to device 0 **
** Can't write to device 0 **
error!
--- drivers/mmc/sdhci.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)
drivers/mmc/sdhci.c +15 -8
@@ -594,14 +594,21 @@ static int sdhci_set_ios(struct mmc *mmc) ctrl &= ~SDHCI_CTRL_4BITBUS ; } -if (mmc->clock >26000000 ) - ctrl |=SDHCI_CTRL_HISPD ; -else - ctrl &= ~SDHCI_CTRL_HISPD ; - -if ((host->quirks &SDHCI_QUIRK_NO_HISPD_BIT ) || - (host->quirks &SDHCI_QUIRK_BROKEN_HISPD_MODE )) - ctrl &= ~SDHCI_CTRL_HISPD ; +if (!(host->quirks &SDHCI_QUIRK_NO_HISPD_BIT ) || + !(host->quirks &SDHCI_QUIRK_BROKEN_HISPD_MODE )) { +if (mmc->selected_mode ==MMC_HS || + mmc->selected_mode ==SD_HS || + mmc->selected_mode ==MMC_DDR_52 || + mmc->selected_mode ==MMC_HS_200 || + mmc->selected_mode ==MMC_HS_400 || + mmc->selected_mode ==UHS_SDR25 || + mmc->selected_mode ==UHS_SDR50 || + mmc->selected_mode ==UHS_SDR104 || + mmc->selected_mode ==UHS_DDR50 ) + ctrl |=SDHCI_CTRL_HISPD ; +else + ctrl &= ~SDHCI_CTRL_HISPD ; + }sdhci_writeb (host, ctrl,SDHCI_HOST_CONTROL );
Signature · 1 line
2.25.1
Quoted 21 lines · Jagan Teki
SDHCI HISPD bits need to be configured based on desired mmc timings mode and some HISPD quirks.
So, handle the HISPD bit based on the mmc computed selected mode(timing parameter) rather than fixed mmc card clock frequency.
Linux handle the HISPD similar like this in below commit,
commit <
501639bf2173> ("mmc: sdhci: fixSDHCI_QUIRK_NO_HISPD_BIThandling")This eventually fixed the mmc write issue observed in rk3399 sdhci controller.
Bug log for refernece,
=> gpt write mmc 0 $partitions
Writing GPT: mmc write failed
** Can't write to device 0 **
** Can't write to device 0 **
error!
Quoted 3 lines
Cc Kever Yang <[email protected]>Cc Peng Fan <[email protected]>Signed-off-by Jagan Teki <[email protected]>
Quoted 39 lines
--- drivers/mmc/sdhci.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)drivers/mmc/sdhci.c +15
-8@@ -594,14 +594,21 @@ static int sdhci_set_ios(struct mmc *mmc) ctrl &= ~SDHCI_CTRL_4BITBUS ; } -if (mmc->clock >26000000 ) - ctrl |=SDHCI_CTRL_HISPD ; -else - ctrl &= ~SDHCI_CTRL_HISPD ; - -if ((host->quirks &SDHCI_QUIRK_NO_HISPD_BIT ) || - (host->quirks &SDHCI_QUIRK_BROKEN_HISPD_MODE )) - ctrl &= ~SDHCI_CTRL_HISPD ; +if (!(host->quirks &SDHCI_QUIRK_NO_HISPD_BIT ) || + !(host->quirks &SDHCI_QUIRK_BROKEN_HISPD_MODE )) { +if (mmc->selected_mode ==MMC_HS || + mmc->selected_mode ==SD_HS || + mmc->selected_mode ==MMC_DDR_52 || + mmc->selected_mode ==MMC_HS_200 || + mmc->selected_mode ==MMC_HS_400 || + mmc->selected_mode ==UHS_SDR25 || + mmc->selected_mode ==UHS_SDR50 || + mmc->selected_mode ==UHS_SDR104 || + mmc->selected_mode ==UHS_DDR50 ) + ctrl |=SDHCI_CTRL_HISPD ; +else + ctrl &= ~SDHCI_CTRL_HISPD ; + }sdhci_writeb (host, ctrl,SDHCI_HOST_CONTROL );