>From 423514b29d50ff76571bc382ae2fe495cf08e733 Mon Sep 17 00:00:00 2001 From: Yunpeng Gao <[email protected]> Date: Thu, 16 Dec 2010 20:01:40 +0800 Subject: [PATCH] Enable runtime PM support of sdhci host controller with pci interface
Follow the kernel runtime PM framework, enable runtime PM support of the sdhci host controller with pci interface. Signed-off-by: Yunpeng Gao <[email protected]> --- drivers/mmc/host/sdhci-pci.c | 122 ++++++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci.c | 38 +++++++++++++ drivers/mmc/host/sdhci.h | 5 ++ 3 files changed, 165 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index 30b1905..d87914a 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -21,6 +21,7 @@ #include <linux/mmc/host.h> #include <linux/regulator/consumer.h> +#include <linux/pm_runtime.h> #include <asm/scatterlist.h> #include <asm/io.h> @@ -984,6 +985,11 @@ static int __devinit sdhci_pci_probe(struct pci_dev *pdev, /* prevent race condition with platform code */ sdhci_pci_request_regulators(); + + pm_runtime_set_active(&pdev->dev); + pm_runtime_enable(&pdev->dev); + pm_runtime_allow(&pdev->dev); + return 0; free: @@ -1011,8 +1017,121 @@ static void __devexit sdhci_pci_remove(struct pci_dev *pdev) } pci_disable_device(pdev); + + pm_runtime_forbid(&pdev->dev); + pm_runtime_disable(&pdev->dev); + } +#ifdef CONFIG_PM_RUNTIME + +static int sdhci_pci_runtime_suspend(struct device *dev) +{ + struct pci_dev *pdev = container_of(dev, struct pci_dev, dev); + struct sdhci_pci_chip *chip; + struct sdhci_pci_slot *slot; + int i, ret; + mmc_pm_flag_t pm_flags = 0; + pm_message_t state; + + chip = pci_get_drvdata(pdev); + if (!chip) + return 0; + + for (i = 0; i < chip->num_slots; i++) { + slot = chip->slots[i]; + if (!slot) + continue; + + ret = sdhci_runtime_suspend(slot->host); + + if (ret) { + for (i--; i >= 0; i--) + sdhci_runtime_resume(chip->slots[i]->host); + return ret; + } + + pm_flags |= slot->host->mmc->pm_flags; + } + + state.event = PM_EVENT_AUTO_SUSPEND; + if (chip->fixes && chip->fixes->suspend) { + ret = chip->fixes->suspend(chip, state); + if (ret) { + for (i = chip->num_slots - 1; i >= 0; i--) + sdhci_runtime_resume(chip->slots[i]->host); + return ret; + } + } + + pci_save_state(pdev); + if (pm_flags & MMC_PM_KEEP_POWER) { + if (pm_flags & MMC_PM_WAKE_SDIO_IRQ) + pci_enable_wake(pdev, PCI_D3hot, 1); + } else { + pci_enable_wake(pdev, PCI_D3hot, 0); + pci_disable_device(pdev); + } + pci_set_power_state(pdev, PCI_D3hot); + + return 0; +} + +static int sdhci_pci_runtime_resume(struct device *dev) +{ + struct pci_dev *pdev = container_of(dev, struct pci_dev, dev); + struct sdhci_pci_chip *chip; + struct sdhci_pci_slot *slot; + int i, ret; + + chip = pci_get_drvdata(pdev); + if (!chip) + return 0; + + pci_set_power_state(pdev, PCI_D0); + pci_restore_state(pdev); + ret = pci_enable_device(pdev); + if (ret) + return ret; + + if (chip->fixes && chip->fixes->resume) { + ret = chip->fixes->resume(chip); + if (ret) + return ret; + } + + for (i = 0; i < chip->num_slots; i++) { + slot = chip->slots[i]; + if (!slot) + continue; + + ret = sdhci_runtime_resume(slot->host); + if (ret) + return ret; + } + + return 0; +} + +static int sdhci_pci_runtime_idle(struct device *dev) +{ + return 0; +} + +#else + +#define sdhci_pci_runtime_suspend NULL +#define sdhci_pci_runtime_resume NULL +#define sdhci_pci_runtime_idle NULL + +#endif + +static const struct dev_pm_ops sdhci_pci_pm_ops = { + .runtime_suspend = sdhci_pci_runtime_suspend, + .runtime_resume = sdhci_pci_runtime_resume, + .runtime_idle = sdhci_pci_runtime_idle, +}; + static struct pci_driver sdhci_driver = { .name = "sdhci-pci", .id_table = pci_ids, @@ -1020,6 +1139,9 @@ static struct pci_driver sdhci_driver = { .remove = __devexit_p(sdhci_pci_remove), .suspend = sdhci_pci_suspend, .resume = sdhci_pci_resume, + .driver = { + .pm = &sdhci_pci_pm_ops + }, }; /*****************************************************************************\ diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 7b9a3b3..91371b9 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1752,6 +1752,44 @@ EXPORT_SYMBOL_GPL(sdhci_resume_host); #endif /* CONFIG_PM */ +#ifdef CONFIG_PM_RUNTIME + +int sdhci_runtime_suspend(struct sdhci_host *host) +{ + int ret = 0; + + if (host->vmmc) + ret = regulator_disable(host->vmmc); + + return ret; +} +EXPORT_SYMBOL_GPL(sdhci_runtime_suspend); + +int sdhci_runtime_resume(struct sdhci_host *host) +{ + int ret = 0; + + if (host->vmmc) { + int ret = regulator_enable(host->vmmc); + if (ret) + return ret; + } + + if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) { + if (host->ops->enable_dma) + host->ops->enable_dma(host); + } + + sdhci_init(host, (host->mmc->pm_flags & MMC_PM_KEEP_POWER)); + sdhci_set_ios(host->mmc, &host->mmc->ios); + mmiowb(); + + return ret; +} +EXPORT_SYMBOL_GPL(sdhci_runtime_resume); + +#endif /* CONFIG_PM_RUNTIME */ + /*****************************************************************************\ * * * Device allocation/registration * diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index b3661ba..e59ec62 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -321,4 +321,9 @@ extern int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state); extern int sdhci_resume_host(struct sdhci_host *host); #endif +#ifdef CONFIG_PM_RUNTIME +extern int sdhci_runtime_suspend(struct sdhci_host *host); +extern int sdhci_runtime_resume(struct sdhci_host *host); +#endif + #endif /* __SDHCI_HW_H */ -- 1.5.4.5 _______________________________________________ MeeGo-kernel mailing list [email protected] http://lists.meego.com/listinfo/meego-kernel
