* [PATCH v2] mmc: sdhci-brcmstb: add cqhci suspend/resume to PM ops
@ 2025-03-11 16:59 Kamal Dasu
2025-03-13 15:13 ` Florian Fainelli
2025-03-17 10:51 ` Ulf Hansson
0 siblings, 2 replies; 3+ messages in thread
From: Kamal Dasu @ 2025-03-11 16:59 UTC (permalink / raw)
To: Kamal Dasu, Al Cooper, Broadcom internal kernel review list,
Adrian Hunter, Ulf Hansson, Florian Fainelli, linux-mmc,
linux-arm-kernel, linux-kernel
Cc: stable
cqhci timeouts observed on brcmstb platforms during suspend:
...
[ 164.832853] mmc0: cqhci: timeout for tag 18
...
Adding cqhci_suspend()/resume() calls to disable cqe
in sdhci_brcmstb_suspend()/resume() respectively to fix
CQE timeouts seen on PM suspend.
Fixes: d46ba2d17f90 ("mmc: sdhci-brcmstb: Add support for Command Queuing (CQE)")
Cc: stable@vger.kernel.org
Signed-off-by: Kamal Dasu <kamal.dasu@broadcom.com>
---
drivers/mmc/host/sdhci-brcmstb.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c
index 0ef4d578ade8..48cdcba0f39c 100644
--- a/drivers/mmc/host/sdhci-brcmstb.c
+++ b/drivers/mmc/host/sdhci-brcmstb.c
@@ -503,8 +503,15 @@ static int sdhci_brcmstb_suspend(struct device *dev)
struct sdhci_host *host = dev_get_drvdata(dev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
struct sdhci_brcmstb_priv *priv = sdhci_pltfm_priv(pltfm_host);
+ int ret;
clk_disable_unprepare(priv->base_clk);
+ if (host->mmc->caps2 & MMC_CAP2_CQE) {
+ ret = cqhci_suspend(host->mmc);
+ if (ret)
+ return ret;
+ }
+
return sdhci_pltfm_suspend(dev);
}
@@ -529,6 +536,9 @@ static int sdhci_brcmstb_resume(struct device *dev)
ret = clk_set_rate(priv->base_clk, priv->base_freq_hz);
}
+ if (host->mmc->caps2 & MMC_CAP2_CQE)
+ ret = cqhci_resume(host->mmc);
+
return ret;
}
#endif
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] mmc: sdhci-brcmstb: add cqhci suspend/resume to PM ops
2025-03-11 16:59 [PATCH v2] mmc: sdhci-brcmstb: add cqhci suspend/resume to PM ops Kamal Dasu
@ 2025-03-13 15:13 ` Florian Fainelli
2025-03-17 10:51 ` Ulf Hansson
1 sibling, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2025-03-13 15:13 UTC (permalink / raw)
To: Kamal Dasu, Al Cooper, Broadcom internal kernel review list,
Adrian Hunter, Ulf Hansson, Florian Fainelli, linux-mmc,
linux-arm-kernel, linux-kernel
Cc: stable
On 3/11/2025 9:59 AM, Kamal Dasu wrote:
> cqhci timeouts observed on brcmstb platforms during suspend:
> ...
> [ 164.832853] mmc0: cqhci: timeout for tag 18
> ...
>
> Adding cqhci_suspend()/resume() calls to disable cqe
> in sdhci_brcmstb_suspend()/resume() respectively to fix
> CQE timeouts seen on PM suspend.
>
> Fixes: d46ba2d17f90 ("mmc: sdhci-brcmstb: Add support for Command Queuing (CQE)")
> Cc: stable@vger.kernel.org
> Signed-off-by: Kamal Dasu <kamal.dasu@broadcom.com>
> ---
> drivers/mmc/host/sdhci-brcmstb.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c
> index 0ef4d578ade8..48cdcba0f39c 100644
> --- a/drivers/mmc/host/sdhci-brcmstb.c
> +++ b/drivers/mmc/host/sdhci-brcmstb.c
> @@ -503,8 +503,15 @@ static int sdhci_brcmstb_suspend(struct device *dev)
> struct sdhci_host *host = dev_get_drvdata(dev);
> struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
> struct sdhci_brcmstb_priv *priv = sdhci_pltfm_priv(pltfm_host);
> + int ret;
Hopefully this won't be causing a possibly uninitialized warning.
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
--
Florian
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] mmc: sdhci-brcmstb: add cqhci suspend/resume to PM ops
2025-03-11 16:59 [PATCH v2] mmc: sdhci-brcmstb: add cqhci suspend/resume to PM ops Kamal Dasu
2025-03-13 15:13 ` Florian Fainelli
@ 2025-03-17 10:51 ` Ulf Hansson
1 sibling, 0 replies; 3+ messages in thread
From: Ulf Hansson @ 2025-03-17 10:51 UTC (permalink / raw)
To: Kamal Dasu
Cc: Al Cooper, Broadcom internal kernel review list, Adrian Hunter,
Florian Fainelli, linux-mmc, linux-arm-kernel, linux-kernel,
stable
On Tue, 11 Mar 2025 at 17:59, Kamal Dasu <kamal.dasu@broadcom.com> wrote:
>
> cqhci timeouts observed on brcmstb platforms during suspend:
> ...
> [ 164.832853] mmc0: cqhci: timeout for tag 18
> ...
>
> Adding cqhci_suspend()/resume() calls to disable cqe
> in sdhci_brcmstb_suspend()/resume() respectively to fix
> CQE timeouts seen on PM suspend.
>
> Fixes: d46ba2d17f90 ("mmc: sdhci-brcmstb: Add support for Command Queuing (CQE)")
> Cc: stable@vger.kernel.org
> Signed-off-by: Kamal Dasu <kamal.dasu@broadcom.com>
Applied for fixes, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/sdhci-brcmstb.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c
> index 0ef4d578ade8..48cdcba0f39c 100644
> --- a/drivers/mmc/host/sdhci-brcmstb.c
> +++ b/drivers/mmc/host/sdhci-brcmstb.c
> @@ -503,8 +503,15 @@ static int sdhci_brcmstb_suspend(struct device *dev)
> struct sdhci_host *host = dev_get_drvdata(dev);
> struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
> struct sdhci_brcmstb_priv *priv = sdhci_pltfm_priv(pltfm_host);
> + int ret;
>
> clk_disable_unprepare(priv->base_clk);
> + if (host->mmc->caps2 & MMC_CAP2_CQE) {
> + ret = cqhci_suspend(host->mmc);
> + if (ret)
> + return ret;
> + }
> +
> return sdhci_pltfm_suspend(dev);
> }
>
> @@ -529,6 +536,9 @@ static int sdhci_brcmstb_resume(struct device *dev)
> ret = clk_set_rate(priv->base_clk, priv->base_freq_hz);
> }
>
> + if (host->mmc->caps2 & MMC_CAP2_CQE)
> + ret = cqhci_resume(host->mmc);
> +
> return ret;
> }
> #endif
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-17 10:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-11 16:59 [PATCH v2] mmc: sdhci-brcmstb: add cqhci suspend/resume to PM ops Kamal Dasu
2025-03-13 15:13 ` Florian Fainelli
2025-03-17 10:51 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox