* [PATCH] ahci_platform: add suspend & resume support
@ 2011-10-30 6:21 JiSheng Zhang
2011-10-30 15:23 ` Srivatsa S. Bhat
2011-10-30 19:16 ` Sergei Shtylyov
0 siblings, 2 replies; 3+ messages in thread
From: JiSheng Zhang @ 2011-10-30 6:21 UTC (permalink / raw)
To: jgarzik; +Cc: linux-ide, avorontsov, linux-kernel
Signed-off-by: JiSheng Zhang <jszhang3@gmail.com>
---
drivers/ata/ahci_platform.c | 54 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index c03277d..60ff9eb 100644
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -202,12 +202,66 @@ static int __devexit ahci_remove(struct platform_device *pdev)
return 0;
}
+#ifdef CONFIG_PM
+static int ahci_suspend(struct platform_device *pdev, pm_message_t mesg)
+{
+ struct ata_host *host = dev_get_drvdata(&pdev->dev);
+ struct ahci_host_priv *hpriv = host->private_data;
+ void __iomem *mmio = hpriv->mmio;
+ u32 ctl;
+
+ if (mesg.event & PM_EVENT_SLEEP) {
+ /* AHCI spec rev1.1 section 8.3.3:
+ * Software must disable interrupts prior to requesting a
+ * transition of the HBA to D3 state.
+ */
+ ctl = readl(mmio + HOST_CTL);
+ ctl &= ~HOST_IRQ_EN;
+ writel(ctl, mmio + HOST_CTL);
+ readl(mmio + HOST_CTL); /* flush */
+ }
+
+ return ata_host_suspend(host, mesg);
+}
+
+static int ahci_resume(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct ahci_platform_data *pdata = dev->platform_data;
+ struct ata_host *host = dev_get_drvdata(dev);
+ struct ahci_host_priv *hpriv = host->private_data;
+ int rc;
+
+ if (pdata && pdata->init) {
+ rc = pdata->init(dev, hpriv->mmio);
+ if (rc)
+ return rc;
+ }
+
+ if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
+ rc = ahci_reset_controller(host);
+ if (rc)
+ return rc;
+
+ ahci_init_controller(host);
+ }
+
+ ata_host_resume(host);
+
+ return 0;
+}
+#endif
+
static struct platform_driver ahci_driver = {
.remove = __devexit_p(ahci_remove),
.driver = {
.name = "ahci",
.owner = THIS_MODULE,
},
+#ifdef CONFIG_PM
+ .suspend = ahci_suspend,
+ .resume = ahci_resume,
+#endif
.id_table = ahci_devtype,
};
--
1.7.6.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ahci_platform: add suspend & resume support
2011-10-30 6:21 [PATCH] ahci_platform: add suspend & resume support JiSheng Zhang
@ 2011-10-30 15:23 ` Srivatsa S. Bhat
2011-10-30 19:16 ` Sergei Shtylyov
1 sibling, 0 replies; 3+ messages in thread
From: Srivatsa S. Bhat @ 2011-10-30 15:23 UTC (permalink / raw)
To: JiSheng Zhang
Cc: jgarzik, linux-ide, avorontsov, linux-kernel,
Linux PM mailing list
Adding linux-pm mailing list to CC, since this is PM related.
On 10/30/2011 11:51 AM, JiSheng Zhang wrote:
>
> Signed-off-by: JiSheng Zhang <jszhang3@gmail.com>
> ---
> drivers/ata/ahci_platform.c | 54 +++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 54 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
> index c03277d..60ff9eb 100644
> --- a/drivers/ata/ahci_platform.c
> +++ b/drivers/ata/ahci_platform.c
> @@ -202,12 +202,66 @@ static int __devexit ahci_remove(struct platform_device *pdev)
> return 0;
> }
>
> +#ifdef CONFIG_PM
> +static int ahci_suspend(struct platform_device *pdev, pm_message_t mesg)
> +{
> + struct ata_host *host = dev_get_drvdata(&pdev->dev);
> + struct ahci_host_priv *hpriv = host->private_data;
> + void __iomem *mmio = hpriv->mmio;
> + u32 ctl;
> +
> + if (mesg.event & PM_EVENT_SLEEP) {
> + /* AHCI spec rev1.1 section 8.3.3:
> + * Software must disable interrupts prior to requesting a
> + * transition of the HBA to D3 state.
> + */
> + ctl = readl(mmio + HOST_CTL);
> + ctl &= ~HOST_IRQ_EN;
> + writel(ctl, mmio + HOST_CTL);
> + readl(mmio + HOST_CTL); /* flush */
> + }
> +
> + return ata_host_suspend(host, mesg);
> +}
> +
> +static int ahci_resume(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct ahci_platform_data *pdata = dev->platform_data;
> + struct ata_host *host = dev_get_drvdata(dev);
> + struct ahci_host_priv *hpriv = host->private_data;
> + int rc;
> +
> + if (pdata && pdata->init) {
> + rc = pdata->init(dev, hpriv->mmio);
> + if (rc)
> + return rc;
> + }
> +
> + if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
> + rc = ahci_reset_controller(host);
> + if (rc)
> + return rc;
> +
> + ahci_init_controller(host);
> + }
> +
> + ata_host_resume(host);
> +
> + return 0;
> +}
> +#endif
> +
> static struct platform_driver ahci_driver = {
> .remove = __devexit_p(ahci_remove),
> .driver = {
> .name = "ahci",
> .owner = THIS_MODULE,
> },
> +#ifdef CONFIG_PM
> + .suspend = ahci_suspend,
> + .resume = ahci_resume,
> +#endif
> .id_table = ahci_devtype,
> };
>
--
Regards,
Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Linux Technology Center,
IBM India Systems and Technology Lab
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ahci_platform: add suspend & resume support
2011-10-30 6:21 [PATCH] ahci_platform: add suspend & resume support JiSheng Zhang
2011-10-30 15:23 ` Srivatsa S. Bhat
@ 2011-10-30 19:16 ` Sergei Shtylyov
1 sibling, 0 replies; 3+ messages in thread
From: Sergei Shtylyov @ 2011-10-30 19:16 UTC (permalink / raw)
To: JiSheng Zhang; +Cc: jgarzik, linux-ide, avorontsov, linux-kernel
Hello.
On 30.10.2011 8:21, JiSheng Zhang wrote:
> Signed-off-by: JiSheng Zhang<jszhang3@gmail.com>
> ---
> drivers/ata/ahci_platform.c | 54 +++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 54 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
> index c03277d..60ff9eb 100644
> --- a/drivers/ata/ahci_platform.c
> +++ b/drivers/ata/ahci_platform.c
> @@ -202,12 +202,66 @@ static int __devexit ahci_remove(struct platform_device *pdev)
> return 0;
> }
>
> +#ifdef CONFIG_PM
> +static int ahci_suspend(struct platform_device *pdev, pm_message_t mesg)
> +{
> + struct ata_host *host = dev_get_drvdata(&pdev->dev);
You can also call platform_get_drvdata(pdev).
> +static int ahci_resume(struct platform_device *pdev)
> +{
> + struct device *dev =&pdev->dev;
> + struct ahci_platform_data *pdata = dev->platform_data;
There's dev_get_platdata().
WBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-10-30 19:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-30 6:21 [PATCH] ahci_platform: add suspend & resume support JiSheng Zhang
2011-10-30 15:23 ` Srivatsa S. Bhat
2011-10-30 19:16 ` Sergei Shtylyov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).