mmc: sdhci-pci: Fix SDHCI_RESET_ALL for CQHCI for Intel GLK-based controllers
Adrian Hunter
maintainerPATCH 1/1 mmc: sdhci-pci: Fix SDHCI_RESET_ALL for CQHCI for Intel GLK-based controllers
For Intel controllers, SDHCI_RESET_ALL resets also CQHCI registers. Normally, SDHCI_RESET_ALL is not used while CQHCI is enabled, but that can happen on the error path. e.g. if mmc_cqe_recovery() fails, mmc_blk_reset() is called which, for a eMMC that does not support HW Reset, will cycle the bus power and the driver will perform SDHCI_RESET_ALL.
So whenever performing SDHCI_RESET_ALL ensure CQHCI is deactivated. That will force the driver to reinitialize CQHCI when it is next used.
A similar change was done already for sdhci-msm, and other drivers using CQHCI might benefit from a similar change, if they also have CQHCI reset by SDHCI_RESET_ALL.
--- drivers/mmc/host/sdhci-pci-core.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-pci-core.c +9 -1
@@ -234,6 +234,14 @@ static void sdhci_pci_dumpregs(struct mmc_host *mmc)sdhci_dumpregs (mmc_priv (mmc)); } +static void sdhci_cqhci_reset (struct sdhci_host *host,u8 mask) +{ +if ((host->mmc->caps2 &MMC_CAP2_CQE ) && (mask &SDHCI_RESET_ALL ) && + host->mmc->cqe_private) +cqhci_deactivate (host->mmc); +sdhci_reset (host, mask); +} +/*****************************************************************************\ * * * Hardware specific quirk handling *
@@ -722,7 +730,7 @@ static const struct sdhci_ops sdhci_intel_glk_ops = { .set_power = sdhci_intel_set_power, .enable_dma = sdhci_pci_enable_dma, .set_bus_width = sdhci_set_bus_width, - .reset = sdhci_reset, + .reset = sdhci_cqhci_reset, .set_uhs_signaling = sdhci_set_uhs_signaling, .hw_reset = sdhci_pci_hw_reset, .irq = sdhci_cqhci_irq,
Signature · 1 line
2.17.1
Quoted 10 lines · Adrian Hunter
For Intel controllers,
SDHCI_RESET_ALLresets also CQHCI registers. Normally,SDHCI_RESET_ALLis not used while CQHCI is enabled, but that can happen on the error path. e.g. ifmmc_cqe_recovery()fails,mmc_blk_reset()is called which, for a eMMC that does not support HW Reset, will cycle the bus power and the driver will performSDHCI_RESET_ALL.So whenever performing
SDHCI_RESET_ALLensure CQHCI is deactivated. That will force the driver to reinitialize CQHCI when it is next used.
Quoted 8 lines
A similar change was done already for sdhci-msm, and other drivers using CQHCI might benefit from a similar change, if they also have CQHCI reset by
SDHCI_RESET_ALL.Fixes 8ee82bda230fc9 ("mmc: sdhci-pci: Add CQHCI support for Intel GLK")Cc [email protected] # 5.4.x: 0ffa6cfbd949: mmc: cqhci: Add cqhci_deactivate()Cc [email protected] # 5.4+Signed-off-by Adrian Hunter <[email protected]>
Applied for fixes, thanks!
Kind regards
Uffe
Quoted 35 lines
--- drivers/mmc/host/sdhci-pci-core.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)drivers/mmc/host/sdhci-pci-core.c +9
-2@@ -234,6 +234,14 @@ static void sdhci_pci_dumpregs(struct mmc_host *mmc)sdhci_dumpregs (mmc_priv (mmc)); } +static void sdhci_cqhci_reset (struct sdhci_host *host,u8 mask) +{ +if ((host->mmc->caps2 &MMC_CAP2_CQE ) && (mask &SDHCI_RESET_ALL ) && + host->mmc->cqe_private) +cqhci_deactivate (host->mmc); +sdhci_reset (host, mask); +} +/*****************************************************************************\ * * * Hardware specific quirk handling * @@ -722,7 +730,7 @@ static const struct sdhci_ops sdhci_intel_glk_ops = { .set_power = sdhci_intel_set_power, .enable_dma = sdhci_pci_enable_dma, .set_bus_width = sdhci_set_bus_width, - .reset = sdhci_reset, + .reset = sdhci_cqhci_reset, .set_uhs_signaling = sdhci_set_uhs_signaling, .hw_reset = sdhci_pci_hw_reset, .irq = sdhci_cqhci_irq, --2.17.1