mmc: sdhci: Fix SDHCI_QUIRK_BROKEN_CQE
Adrian Hunter
maintainerPATCH 1/1 mmc: sdhci: Fix SDHCI_QUIRK_BROKEN_CQE
Previous to commit 511ce378e16f07 ("mmc: Add MMC host software queue support"), removing MMC_CAP2_CQE was enough to disable command queuing, but now the cqe_ops must also be NULL otherwise ->cqe_enable() will be called. Fix SDHCI_QUIRK_BROKEN_CQE to do that.
Signed-off-by Adrian Hunter <[email protected]>
Fixes 511ce378e16f07 ("mmc: Add MMC host software queue support")
--- drivers/mmc/host/sdhci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/mmc/host/sdhci.c +6 -3
@@ -4131,9 +4131,6 @@ int sdhci_setup_host(struct sdhci_host *host) mmc_hostname(mmc), host->version); } -if (host->quirks &SDHCI_QUIRK_BROKEN_CQE ) - mmc->caps2 &= ~MMC_CAP2_CQE ; -if (host->quirks &SDHCI_QUIRK_FORCE_DMA ) host->flags |=SDHCI_USE_SDMA ;else if (!(host->caps &SDHCI_CAN_DO_SDMA ))
@@ -4662,6 +4659,12 @@ int __sdhci_add_host(struct sdhci_host *host)struct mmc_host *mmc = host->mmc;int ret; +if ((mmc->caps2 &MMC_CAP2_CQE ) && + (host->quirks &SDHCI_QUIRK_BROKEN_CQE )) { + mmc->caps2 &= ~MMC_CAP2_CQE ; + mmc->cqe_ops =NULL ; + } + host->complete_wq =alloc_workqueue ("sdhci" , flags,0 );if (!host->complete_wq)return -ENOMEM ;
Signature · 1 line
2.17.1
Quoted 8 lines · Adrian Hunter
Previous to commit
511ce378e16f07("mmc: Add MMC host software queue support"), removingMMC_CAP2_CQEwas enough to disable command queuing, but now thecqe_opsmust also be NULL otherwise ->cqe_enable() will be called. FixSDHCI_QUIRK_BROKEN_CQEto do that.Signed-off-by Adrian Hunter <[email protected]>Fixes 511ce378e16f07 ("mmc: Add MMC host software queue support")
Applied for fixes, thanks!
Kind regards
Uffe
Quoted 34 lines
--- drivers/mmc/host/sdhci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/mmc/host/sdhci.c +6
-4@@ -4131,9 +4131,6 @@ int sdhci_setup_host(struct sdhci_host *host) mmc_hostname(mmc), host->version); } -if (host->quirks &SDHCI_QUIRK_BROKEN_CQE ) - mmc->caps2 &= ~MMC_CAP2_CQE ; -if (host->quirks &SDHCI_QUIRK_FORCE_DMA ) host->flags |=SDHCI_USE_SDMA ;else if (!(host->caps &SDHCI_CAN_DO_SDMA ))@@ -4662,6 +4659,12 @@ int __sdhci_add_host(struct sdhci_host *host)struct mmc_host *mmc = host->mmc;int ret; +if ((mmc->caps2 &MMC_CAP2_CQE ) && + (host->quirks &SDHCI_QUIRK_BROKEN_CQE )) { + mmc->caps2 &= ~MMC_CAP2_CQE ; + mmc->cqe_ops =NULL ; + } + host->complete_wq =alloc_workqueue ("sdhci" , flags,0 );if (!host->complete_wq)return -ENOMEM ; --2.17.1