rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6904001a3c
kernel/0100-feat-emmc-sd-sdio-sdhci-support-power-management.patch
Jason Montleon 6904001a3c Update to 6.6.67
2024-12-19 16:34:44 -05:00

347 lines
9.8 KiB
Diff
Raw Blame History

From 574c24ce8a286d0afbc669b92d20f55d591956ad Mon Sep 17 00:00:00 2001
From: liangshuang <liangshuang@eswincomputing.com>
Date: Tue, 16 Jul 2024 17:32:14 +0800
Subject: [PATCH 100/219] feat(emmc sd sdio):sdhci support power management
Changelogs:
1.sdhci driver support power management.
2.fix the issue of actual_clock is wrong.
Signed-off-by: liangshuang <liangshuang@eswincomputing.com>
---
drivers/mmc/host/sdhci-eswin.c | 2 +
drivers/mmc/host/sdhci-of-eswin-sdio.c | 107 +++++++++++++++++--------
drivers/mmc/host/sdhci-of-eswin.c | 95 +++++++++++++++-------
3 files changed, 144 insertions(+), 60 deletions(-)
diff --git a/drivers/mmc/host/sdhci-eswin.c b/drivers/mmc/host/sdhci-eswin.c
index c823d034ce6b..e75d8b77acdb 100644
--- a/drivers/mmc/host/sdhci-eswin.c
+++ b/drivers/mmc/host/sdhci-eswin.c
@@ -112,6 +112,8 @@ void eswin_sdhci_set_core_clock(struct sdhci_host *host,
unsigned int div, divide;
unsigned int flag_sel, max_clk;
+ host->mmc->actual_clock = clock;
+
if (clock == 0) {
eswin_mshc_coreclk_disable(host);
return;
diff --git a/drivers/mmc/host/sdhci-of-eswin-sdio.c b/drivers/mmc/host/sdhci-of-eswin-sdio.c
index d5ae6a5694f6..f9090ece0f65 100644
--- a/drivers/mmc/host/sdhci-of-eswin-sdio.c
+++ b/drivers/mmc/host/sdhci-of-eswin-sdio.c
@@ -64,16 +64,15 @@ static void eswin_sdhci_sdio_set_clock(struct sdhci_host *host,
}
eswin_sdhci_set_core_clock(host, clock);
- sdhci_set_clock(host, clock);
if (eswin_sdhci_sdio->quirks & SDHCI_ESWIN_QUIRK_CLOCK_UNSTABLE)
/*
- * Some controllers immediately report SDHCI_CLOCK_INT_STABLE
- * after enabling the clock even though the clock is not
- * stable. Trying to use a clock without waiting here results
- * in EILSEQ while detecting some older/slower cards. The
- * chosen delay is the maximum delay from sdhci_set_clock.
- */
+ * Some controllers immediately report SDHCI_CLOCK_INT_STABLE
+ * after enabling the clock even though the clock is not
+ * stable. Trying to use a clock without waiting here results
+ * in EILSEQ while detecting some older/slower cards. The
+ * chosen delay is the maximum delay from sdhci_set_clock.
+ */
msleep(20);
}
@@ -357,21 +356,10 @@ static int eswin_sdhci_sdio_suspend(struct device *dev)
sdhci_pltfm_priv(pltfm_host);
int ret;
- if (host->tuning_mode != SDHCI_TUNING_MODE_3)
- mmc_retune_needed(host->mmc);
-
- if (eswin_sdhci_sdio->has_cqe) {
- ret = cqhci_suspend(host->mmc);
- if (ret)
- return ret;
- }
-
- ret = sdhci_suspend_host(host);
+ ret = sdhci_pltfm_suspend(dev);
if (ret)
return ret;
-
- clk_disable(pltfm_host->clk);
- clk_disable(eswin_sdhci_sdio->clk_ahb);
+ clk_disable_unprepare(eswin_sdhci_sdio->clk_ahb);
return 0;
}
@@ -392,33 +380,80 @@ static int eswin_sdhci_sdio_resume(struct device *dev)
sdhci_pltfm_priv(pltfm_host);
int ret;
- ret = clk_enable(eswin_sdhci_sdio->clk_ahb);
+ ret = clk_prepare_enable(eswin_sdhci_sdio->clk_ahb);
if (ret) {
- dev_err(dev, "Cannot enable AHB clock.\n");
+ dev_err(dev, "can't enable clk_ahb\n");
return ret;
}
- ret = clk_enable(pltfm_host->clk);
+ ret = sdhci_pltfm_resume(dev);
if (ret) {
- dev_err(dev, "Cannot enable SD clock.\n");
- return ret;
+ dev_err(dev, "pltfm resume failed!\n");
+ goto clk_disable;
}
- ret = sdhci_resume_host(host);
+ return 0;
+clk_disable:
+ clk_disable_unprepare(eswin_sdhci_sdio->clk_ahb);
+
+ return ret;
+}
+
+static int eswin_sdhci_sdio_runtime_suspend(struct device *dev)
+{
+ struct sdhci_host *host = dev_get_drvdata(dev);
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct eswin_sdhci_data *eswin_sdhci_sdio = sdhci_pltfm_priv(pltfm_host);
+ int ret;
+
+ ret = sdhci_runtime_suspend_host(host);
+ if (ret)
+ return ret;
+
+ if (host->tuning_mode != SDHCI_TUNING_MODE_3)
+ mmc_retune_needed(host->mmc);
+
+ clk_disable_unprepare(pltfm_host->clk);
+ clk_disable_unprepare(eswin_sdhci_sdio->clk_ahb);
+
+ return 0;
+}
+
+static int eswin_sdhci_sdio_runtime_resume(struct device *dev)
+{
+ struct sdhci_host *host = dev_get_drvdata(dev);
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct eswin_sdhci_data *eswin_sdhci_sdio = sdhci_pltfm_priv(pltfm_host);
+ int ret;
+
+ ret = clk_prepare_enable(eswin_sdhci_sdio->clk_ahb);
if (ret) {
- dev_err(dev, "Cannot resume host.\n");
+ dev_err(dev, "can't enable clk_ahb\n");
return ret;
}
- if (eswin_sdhci_sdio->has_cqe)
- return cqhci_resume(host->mmc);
+ ret = clk_prepare_enable(pltfm_host->clk);
+ if (ret) {
+ dev_err(dev, "can't enable mainck\n");
+ goto clk_ahb_disable;
+ }
+
+ ret = sdhci_runtime_resume_host(host, 0);
+ if (ret) {
+ dev_err(dev, "runtime resume failed!\n");
+ goto clk_disable;
+ }
return 0;
+clk_disable:
+ clk_disable_unprepare(pltfm_host->clk);
+clk_ahb_disable:
+ clk_disable_unprepare(eswin_sdhci_sdio->clk_ahb);
+
+ return ret;
}
-#endif /* ! CONFIG_PM_SLEEP */
-static SIMPLE_DEV_PM_OPS(eswin_sdhci_sdio_dev_pm_ops, eswin_sdhci_sdio_suspend,
- eswin_sdhci_sdio_resume);
+#endif /* ! CONFIG_PM_SLEEP */
/**
* eswin_sdhci_sdio_sdcardclk_recalc_rate- Return the card clock rate
@@ -980,12 +1015,18 @@ static int eswin_sdhci_sdio_remove(struct platform_device *pdev)
return 0;
}
+static const struct dev_pm_ops eswin_sdhci_sdio_pmops = {
+ SET_SYSTEM_SLEEP_PM_OPS(eswin_sdhci_sdio_suspend, eswin_sdhci_sdio_resume)
+ SET_RUNTIME_PM_OPS(eswin_sdhci_sdio_runtime_suspend,
+ eswin_sdhci_sdio_runtime_resume, NULL)
+};
+
static struct platform_driver eswin_sdhci_sdio_driver = {
.driver = {
.name = "eswin-sdhci-sdio",
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
.of_match_table = eswin_sdhci_sdio_of_match,
- .pm = &eswin_sdhci_sdio_dev_pm_ops,
+ .pm = &eswin_sdhci_sdio_pmops,
},
.probe = eswin_sdhci_sdio_probe,
.remove = eswin_sdhci_sdio_remove,
diff --git a/drivers/mmc/host/sdhci-of-eswin.c b/drivers/mmc/host/sdhci-of-eswin.c
index a0347ac5c739..3e2912aca476 100644
--- a/drivers/mmc/host/sdhci-of-eswin.c
+++ b/drivers/mmc/host/sdhci-of-eswin.c
@@ -74,7 +74,6 @@ static void eswin_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
clk_data->set_clk_delays(host);
eswin_sdhci_set_core_clock(host, clock);
- sdhci_set_clock(host, clock);
/*
* Some controllers immediately report SDHCI_CLOCK_INT_STABLE
@@ -477,21 +476,10 @@ static int eswin_sdhci_suspend(struct device *dev)
struct eswin_sdhci_data *eswin_sdhci = sdhci_pltfm_priv(pltfm_host);
int ret;
- if (host->tuning_mode != SDHCI_TUNING_MODE_3)
- mmc_retune_needed(host->mmc);
-
- if (eswin_sdhci->has_cqe) {
- ret = cqhci_suspend(host->mmc);
- if (ret)
- return ret;
- }
-
- ret = sdhci_suspend_host(host);
+ ret = sdhci_pltfm_suspend(dev);
if (ret)
return ret;
-
- clk_disable(pltfm_host->clk);
- clk_disable(eswin_sdhci->clk_ahb);
+ clk_disable_unprepare(eswin_sdhci->clk_ahb);
return 0;
}
@@ -511,33 +499,80 @@ static int eswin_sdhci_resume(struct device *dev)
struct eswin_sdhci_data *eswin_sdhci = sdhci_pltfm_priv(pltfm_host);
int ret;
- ret = clk_enable(eswin_sdhci->clk_ahb);
+ ret = clk_prepare_enable(eswin_sdhci->clk_ahb);
if (ret) {
- dev_err(dev, "Cannot enable AHB clock.\n");
+ dev_err(dev, "can't enable clk_ahb\n");
return ret;
}
- ret = clk_enable(pltfm_host->clk);
+ ret = sdhci_pltfm_resume(dev);
if (ret) {
- dev_err(dev, "Cannot enable SD clock.\n");
- return ret;
+ dev_err(dev, "pltfm resume failed!\n");
+ goto clk_disable;
}
- ret = sdhci_resume_host(host);
+ return 0;
+clk_disable:
+ clk_disable_unprepare(eswin_sdhci->clk_ahb);
+
+ return ret;
+}
+
+static int eswin_sdhci_runtime_suspend(struct device *dev)
+{
+ struct sdhci_host *host = dev_get_drvdata(dev);
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct eswin_sdhci_data *eswin_sdhci = sdhci_pltfm_priv(pltfm_host);
+ int ret;
+
+ ret = sdhci_runtime_suspend_host(host);
+ if (ret)
+ return ret;
+
+ if (host->tuning_mode != SDHCI_TUNING_MODE_3)
+ mmc_retune_needed(host->mmc);
+
+ clk_disable_unprepare(pltfm_host->clk);
+ clk_disable_unprepare(eswin_sdhci->clk_ahb);
+
+ return 0;
+}
+
+static int eswin_sdhci_runtime_resume(struct device *dev)
+{
+ struct sdhci_host *host = dev_get_drvdata(dev);
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct eswin_sdhci_data *eswin_sdhci = sdhci_pltfm_priv(pltfm_host);
+ int ret;
+
+ ret = clk_prepare_enable(eswin_sdhci->clk_ahb);
if (ret) {
- dev_err(dev, "Cannot resume host.\n");
+ dev_err(dev, "can't enable clk_ahb\n");
return ret;
}
- if (eswin_sdhci->has_cqe)
- return cqhci_resume(host->mmc);
+ ret = clk_prepare_enable(pltfm_host->clk);
+ if (ret) {
+ dev_err(dev, "can't enable mainck\n");
+ goto clk_ahb_disable;
+ }
+
+ ret = sdhci_runtime_resume_host(host, 0);
+ if (ret) {
+ dev_err(dev, "runtime resume failed!\n");
+ goto clk_disable;
+ }
return 0;
+clk_disable:
+ clk_disable_unprepare(pltfm_host->clk);
+clk_ahb_disable:
+ clk_disable_unprepare(eswin_sdhci->clk_ahb);
+
+ return ret;
}
-#endif /* ! CONFIG_PM_SLEEP */
-static SIMPLE_DEV_PM_OPS(eswin_sdhci_dev_pm_ops, eswin_sdhci_suspend,
- eswin_sdhci_resume);
+#endif /* ! CONFIG_PM_SLEEP */
/**
* eswin_sdhci_sdcardclk_recalc_rate - Return the card clock rate
@@ -1073,13 +1108,19 @@ static void eswin_sdhci_shutdown(struct platform_device *pdev)
platform_set_drvdata(pdev, NULL);
}
+static const struct dev_pm_ops eswin_sdhci_pmops = {
+ SET_SYSTEM_SLEEP_PM_OPS(eswin_sdhci_suspend, eswin_sdhci_resume)
+ SET_RUNTIME_PM_OPS(eswin_sdhci_runtime_suspend,
+ eswin_sdhci_runtime_resume, NULL)
+};
+
static struct platform_driver eswin_sdhci_driver =
{
.driver = {
.name = "sdhci-eswin",
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
.of_match_table = eswin_sdhci_of_match,
- .pm = &eswin_sdhci_dev_pm_ops,
+ .pm = &eswin_sdhci_pmops,
},
.probe = eswin_sdhci_probe,
.remove = eswin_sdhci_remove,
--
2.47.0
Reference in New Issue View Git Blame Copy Permalink