On 24/10/22 20:55, Brian Norris wrote:
> An earlier patch ("mmc: cqhci: Provide helper for resetting both SDHCI
> and CQHCI") does these operations for us.
>
> I keep these as a separate patch, since the earlier patch is a
> prerequisite to some important bugfixes that need to be backported via
> linux-stable.
>
> Signed-off-by: Brian Norris <briannorris@xxxxxxxxxxxx>
Acked-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> ---
>
> Changes in v3:
> - Rewrite to new helper, patch sdhci-msm too
>
> Changes in v2:
> - Factor out ->cqe_private helpers
>
> drivers/mmc/host/sdhci-msm.c | 10 ++--------
> drivers/mmc/host/sdhci-pci-core.c | 11 ++---------
> drivers/mmc/host/sdhci-pci-gli.c | 11 ++---------
> 3 files changed, 6 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
> index 3a091a387ecb..03f76384ab3f 100644
> --- a/drivers/mmc/host/sdhci-msm.c
> +++ b/drivers/mmc/host/sdhci-msm.c
> @@ -19,6 +19,7 @@
> #include <linux/pinctrl/consumer.h>
> #include <linux/reset.h>
>
> +#include "sdhci-cqhci.h"
> #include "sdhci-pltfm.h"
> #include "cqhci.h"
>
> @@ -2304,13 +2305,6 @@ static void sdhci_msm_set_regulator_caps(struct sdhci_msm_host *msm_host)
> pr_debug("%s: supported caps: 0x%08x\n", mmc_hostname(mmc), caps);
> }
>
> -static void sdhci_msm_reset(struct sdhci_host *host, u8 mask)
> -{
> - if ((host->mmc->caps2 & MMC_CAP2_CQE) && (mask & SDHCI_RESET_ALL))
> - cqhci_deactivate(host->mmc);
> - sdhci_reset(host, mask);
> -}
> -
> static int sdhci_msm_register_vreg(struct sdhci_msm_host *msm_host)
> {
> int ret;
> @@ -2450,7 +2444,7 @@ static const struct of_device_id sdhci_msm_dt_match[] = {
> MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match);
>
> static const struct sdhci_ops sdhci_msm_ops = {
> - .reset = sdhci_msm_reset,
> + .reset = sdhci_and_cqhci_reset,
> .set_clock = sdhci_msm_set_clock,
> .get_min_clock = sdhci_msm_get_min_clock,
> .get_max_clock = sdhci_msm_get_max_clock,
> diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
> index 169b84761041..cc039155b5c7 100644
> --- a/drivers/mmc/host/sdhci-pci-core.c
> +++ b/drivers/mmc/host/sdhci-pci-core.c
> @@ -38,6 +38,7 @@
> #include "cqhci.h"
>
> #include "sdhci.h"
> +#include "sdhci-cqhci.h"
> #include "sdhci-pci.h"
>
> static void sdhci_pci_hw_reset(struct sdhci_host *host);
> @@ -234,14 +235,6 @@ 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 *
> @@ -703,7 +696,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_cqhci_reset,
> + .reset = sdhci_and_cqhci_reset,
> .set_uhs_signaling = sdhci_intel_set_uhs_signaling,
> .hw_reset = sdhci_pci_hw_reset,
> .irq = sdhci_cqhci_irq,
> diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-gli.c
> index 4d509f656188..633a8ee8f8c5 100644
> --- a/drivers/mmc/host/sdhci-pci-gli.c
> +++ b/drivers/mmc/host/sdhci-pci-gli.c
> @@ -15,6 +15,7 @@
> #include <linux/of.h>
> #include <linux/iopoll.h>
> #include "sdhci.h"
> +#include "sdhci-cqhci.h"
> #include "sdhci-pci.h"
> #include "cqhci.h"
>
> @@ -922,14 +923,6 @@ static int gl9763e_add_host(struct sdhci_pci_slot *slot)
> return ret;
> }
>
> -static void sdhci_gl9763e_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);
> -}
> -
> static void gli_set_gl9763e(struct sdhci_pci_slot *slot)
> {
> struct pci_dev *pdev = slot->chip->pdev;
> @@ -1136,7 +1129,7 @@ static const struct sdhci_ops sdhci_gl9763e_ops = {
> .set_clock = sdhci_set_clock,
> .enable_dma = sdhci_pci_enable_dma,
> .set_bus_width = sdhci_set_bus_width,
> - .reset = sdhci_gl9763e_reset,
> + .reset = sdhci_and_cqhci_reset,
> .set_uhs_signaling = sdhci_set_gl9763e_signaling,
> .voltage_switch = sdhci_gli_voltage_switch,
> .irq = sdhci_gl9763e_cqhci_irq,
