On Wed, 19 Aug 2020 at 14:19, Adrian Hunter <adrian.hunter@xxxxxxxxx> wrote:
>
> 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.
>
> Fixes: 8ee82bda230fc9 ("mmc: sdhci-pci: Add CQHCI support for Intel GLK")
> Cc: stable@xxxxxxxxxxxxxxx # 5.4.x: 0ffa6cfbd949: mmc: cqhci: Add cqhci_deactivate()
> Cc: stable@xxxxxxxxxxxxxxx # 5.4+
> Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Applied for fixes, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/sdhci-pci-core.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
> index c0e081e48d3f..d0c8d39d5dbd 100644
> --- a/drivers/mmc/host/sdhci-pci-core.c
> +++ b/drivers/mmc/host/sdhci-pci-core.c
> @@ -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
>
