Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1686354 > unrolled thread
| Started by | Quentin Schulz <quentin.schulz@free-electrons.com> |
|---|---|
| First post | 2017-07-13 10:10 +0200 |
| Last post | 2017-07-13 12:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH v3 2/2] mmc: sdhci-of-at91: set clocks and presets after resume from deepest PM Quentin Schulz <quentin.schulz@free-electrons.com> - 2017-07-13 10:10 +0200
Re: [PATCH v3 2/2] mmc: sdhci-of-at91: set clocks and presets after resume from deepest PM Ulf Hansson <ulf.hansson@linaro.org> - 2017-07-13 12:10 +0200
| From | Quentin Schulz <quentin.schulz@free-electrons.com> |
|---|---|
| Date | 2017-07-13 10:10 +0200 |
| Subject | [PATCH v3 2/2] mmc: sdhci-of-at91: set clocks and presets after resume from deepest PM |
| Message-ID | <u2Hma-34F-15@gated-at.bofh.it> |
This adds deepest (Backup+Self-Refresh) PM support to the ATMEL SAMA5D2
SoC's SDHCI controller.
When resuming from deepest state, it is required to restore preset
registers as the registers are lost since VDD core has been shut down
when entering deepest state on the SAMA5D2. The clocks need to be
reconfigured as well.
The other registers and init process are taken care of by the SDHCI
core.
Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
Acked-by: Ludovic Desroches <ludovic.desroches@microchip.com>
---
v3:
- pm_runtime_force_suspend before setting restore_needed flag,
v2:
- use runtime_resume as system_resume,
- set a flag to tell when restoring presets is needed,
- use a flag to tell runtime_resume to restore presets,
- surround sdhci_at91_suspend with ifdef CONFIG_PM_SLEEP instead of CONFIG_PM,
drivers/mmc/host/sdhci-of-at91.c | 32 ++++++++++++++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
index fb8c6011f13d..88e9b5f35a62 100644
--- a/drivers/mmc/host/sdhci-of-at91.c
+++ b/drivers/mmc/host/sdhci-of-at91.c
@@ -41,6 +41,7 @@ struct sdhci_at91_priv {
struct clk *hclock;
struct clk *gck;
struct clk *mainck;
+ bool restore_needed;
};
static void sdhci_at91_set_clock(struct sdhci_host *host, unsigned int clock)
@@ -206,6 +207,22 @@ static int sdhci_at91_set_clks_presets(struct device *dev)
return 0;
}
+#ifdef CONFIG_PM_SLEEP
+static int sdhci_at91_suspend(struct device *dev)
+{
+ struct sdhci_host *host = dev_get_drvdata(dev);
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct sdhci_at91_priv *priv = sdhci_pltfm_priv(pltfm_host);
+ int ret;
+
+ ret = pm_runtime_force_suspend(dev);
+
+ priv->restore_needed = true;
+
+ return ret;
+}
+#endif /* CONFIG_PM_SLEEP */
+
#ifdef CONFIG_PM
static int sdhci_at91_runtime_suspend(struct device *dev)
{
@@ -233,6 +250,15 @@ static int sdhci_at91_runtime_resume(struct device *dev)
struct sdhci_at91_priv *priv = sdhci_pltfm_priv(pltfm_host);
int ret;
+ if (priv->restore_needed) {
+ ret = sdhci_at91_set_clks_presets(dev);
+ if (ret)
+ return ret;
+
+ priv->restore_needed = false;
+ goto out;
+ }
+
ret = clk_prepare_enable(priv->mainck);
if (ret) {
dev_err(dev, "can't enable mainck\n");
@@ -251,13 +277,13 @@ static int sdhci_at91_runtime_resume(struct device *dev)
return ret;
}
+out:
return sdhci_runtime_resume_host(host);
}
#endif /* CONFIG_PM */
static const struct dev_pm_ops sdhci_at91_dev_pm_ops = {
- SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
- pm_runtime_force_resume)
+ SET_SYSTEM_SLEEP_PM_OPS(sdhci_at91_suspend, pm_runtime_force_resume)
SET_RUNTIME_PM_OPS(sdhci_at91_runtime_suspend,
sdhci_at91_runtime_resume,
NULL)
@@ -306,6 +332,8 @@ static int sdhci_at91_probe(struct platform_device *pdev)
if (ret)
goto sdhci_pltfm_free;
+ priv->restore_needed = false;
+
ret = mmc_of_parse(host->mmc);
if (ret)
goto clocks_disable_unprepare;
--
2.11.0
[toc] | [next] | [standalone]
| From | Ulf Hansson <ulf.hansson@linaro.org> |
|---|---|
| Date | 2017-07-13 12:10 +0200 |
| Subject | Re: [PATCH v3 2/2] mmc: sdhci-of-at91: set clocks and presets after resume from deepest PM |
| Message-ID | <u2Jej-4ic-51@gated-at.bofh.it> |
| In reply to | #1686354 |
On 13 July 2017 at 10:04, Quentin Schulz
<quentin.schulz@free-electrons.com> wrote:
> This adds deepest (Backup+Self-Refresh) PM support to the ATMEL SAMA5D2
> SoC's SDHCI controller.
>
> When resuming from deepest state, it is required to restore preset
> registers as the registers are lost since VDD core has been shut down
> when entering deepest state on the SAMA5D2. The clocks need to be
> reconfigured as well.
>
> The other registers and init process are taken care of by the SDHCI
> core.
>
> Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>
> Acked-by: Ludovic Desroches <ludovic.desroches@microchip.com>
Thanks, applied for next!
Kind regards
Uffe
> ---
>
> v3:
> - pm_runtime_force_suspend before setting restore_needed flag,
>
> v2:
> - use runtime_resume as system_resume,
> - set a flag to tell when restoring presets is needed,
> - use a flag to tell runtime_resume to restore presets,
> - surround sdhci_at91_suspend with ifdef CONFIG_PM_SLEEP instead of CONFIG_PM,
>
> drivers/mmc/host/sdhci-of-at91.c | 32 ++++++++++++++++++++++++++++++--
> 1 file changed, 30 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
> index fb8c6011f13d..88e9b5f35a62 100644
> --- a/drivers/mmc/host/sdhci-of-at91.c
> +++ b/drivers/mmc/host/sdhci-of-at91.c
> @@ -41,6 +41,7 @@ struct sdhci_at91_priv {
> struct clk *hclock;
> struct clk *gck;
> struct clk *mainck;
> + bool restore_needed;
> };
>
> static void sdhci_at91_set_clock(struct sdhci_host *host, unsigned int clock)
> @@ -206,6 +207,22 @@ static int sdhci_at91_set_clks_presets(struct device *dev)
> return 0;
> }
>
> +#ifdef CONFIG_PM_SLEEP
> +static int sdhci_at91_suspend(struct device *dev)
> +{
> + struct sdhci_host *host = dev_get_drvdata(dev);
> + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
> + struct sdhci_at91_priv *priv = sdhci_pltfm_priv(pltfm_host);
> + int ret;
> +
> + ret = pm_runtime_force_suspend(dev);
> +
> + priv->restore_needed = true;
> +
> + return ret;
> +}
> +#endif /* CONFIG_PM_SLEEP */
> +
> #ifdef CONFIG_PM
> static int sdhci_at91_runtime_suspend(struct device *dev)
> {
> @@ -233,6 +250,15 @@ static int sdhci_at91_runtime_resume(struct device *dev)
> struct sdhci_at91_priv *priv = sdhci_pltfm_priv(pltfm_host);
> int ret;
>
> + if (priv->restore_needed) {
> + ret = sdhci_at91_set_clks_presets(dev);
> + if (ret)
> + return ret;
> +
> + priv->restore_needed = false;
> + goto out;
> + }
> +
> ret = clk_prepare_enable(priv->mainck);
> if (ret) {
> dev_err(dev, "can't enable mainck\n");
> @@ -251,13 +277,13 @@ static int sdhci_at91_runtime_resume(struct device *dev)
> return ret;
> }
>
> +out:
> return sdhci_runtime_resume_host(host);
> }
> #endif /* CONFIG_PM */
>
> static const struct dev_pm_ops sdhci_at91_dev_pm_ops = {
> - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
> - pm_runtime_force_resume)
> + SET_SYSTEM_SLEEP_PM_OPS(sdhci_at91_suspend, pm_runtime_force_resume)
> SET_RUNTIME_PM_OPS(sdhci_at91_runtime_suspend,
> sdhci_at91_runtime_resume,
> NULL)
> @@ -306,6 +332,8 @@ static int sdhci_at91_probe(struct platform_device *pdev)
> if (ret)
> goto sdhci_pltfm_free;
>
> + priv->restore_needed = false;
> +
> ret = mmc_of_parse(host->mmc);
> if (ret)
> goto clocks_disable_unprepare;
> --
> 2.11.0
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web