From: Lin Ming <ming.m.lin@intel.com>
To: Jeff Garzik <jgarzik@pobox.com>,
"Rafael J. Wysocki" <rjw@sisk.pl>, Tejun Heo <tj@kernel.org>
Cc: Alan Stern <stern@rowland.harvard.edu>,
linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org,
linux-pm@vger.kernel.org
Subject: [PATCH v2 2/3] ahci: add runtime PM callbacks
Date: Tue, 27 Dec 2011 13:42:33 +0800 [thread overview]
Message-ID: <1324964554-9719-3-git-send-email-ming.m.lin@intel.com> (raw)
In-Reply-To: <1324964554-9719-1-git-send-email-ming.m.lin@intel.com>
Add ahci controller runtime PM callbacks.
Call pm_runtime_put_noidle() in its probe routine and
pm_runtime_get_noresume() in its remove routine.
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
drivers/ata/ahci.c | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 183c8b2..f70f030 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -46,6 +46,7 @@
#include <scsi/scsi_host.h>
#include <scsi/scsi_cmnd.h>
#include <linux/libata.h>
+#include <linux/pm_runtime.h>
#include "ahci.h"
#define DRV_NAME "ahci"
@@ -79,6 +80,7 @@ enum board_ids {
};
static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
+static void ahci_remove_one(struct pci_dev *pdev);
static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class,
unsigned long deadline);
static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class,
@@ -88,6 +90,7 @@ static int ahci_pci_device_suspend(struct device *dev);
static int ahci_pci_device_resume(struct device *dev);
static int ahci_pci_device_freeze(struct device *dev);
static int ahci_pci_device_poweroff(struct device *dev);
+static int ahci_pci_device_runtime_idle(struct device *dev);
#endif
static struct scsi_host_template ahci_sht = {
@@ -409,13 +412,16 @@ static const struct dev_pm_ops ahci_pci_pm_ops = {
.thaw = ahci_pci_device_resume,
.poweroff = ahci_pci_device_poweroff,
.restore = ahci_pci_device_resume,
+ .runtime_suspend = ahci_pci_device_suspend,
+ .runtime_resume = ahci_pci_device_resume,
+ .runtime_idle = ahci_pci_device_runtime_idle
};
static struct pci_driver ahci_pci_driver = {
.name = DRV_NAME,
.id_table = ahci_pci_tbl,
.probe = ahci_init_one,
- .remove = ata_pci_remove_one,
+ .remove = ahci_remove_one,
#ifdef CONFIG_PM
.driver = {
.pm = &ahci_pci_pm_ops
@@ -650,6 +656,11 @@ static int ahci_pci_device_resume(struct device *dev)
return 0;
}
+
+static int ahci_pci_device_runtime_idle(struct device *dev)
+{
+ return pm_runtime_suspend(dev);
+}
#endif
static int ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac)
@@ -1239,10 +1250,20 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
ahci_pci_print_info(host);
pci_set_master(pdev);
+ pm_runtime_put_noidle(dev);
+ pm_runtime_allow(dev);
return ata_host_activate(host, pdev->irq, ahci_interrupt, IRQF_SHARED,
&ahci_sht);
}
+static void ahci_remove_one(struct pci_dev *pdev)
+{
+ pm_runtime_forbid(&pdev->dev);
+ pm_runtime_get_noresume(&pdev->dev);
+
+ ata_pci_remove_one(pdev);
+}
+
static int __init ahci_init(void)
{
return pci_register_driver(&ahci_pci_driver);
--
1.7.2.5
next prev parent reply other threads:[~2011-12-27 5:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-27 5:42 [PATCH v2 0/3] ahci controller runtime PM support Lin Ming
2011-12-27 5:42 ` [PATCH v2 1/3] ahci: port legacy pm interface to struct dev_pm_ops Lin Ming
2011-12-27 5:42 ` Lin Ming [this message]
2011-12-27 5:42 ` [PATCH v2 3/3] ata: runtime suspend port if no device attached Lin Ming
2012-01-13 2:17 ` [PATCH v2 0/3] ahci controller runtime PM support Lin Ming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1324964554-9719-3-git-send-email-ming.m.lin@intel.com \
--to=ming.m.lin@intel.com \
--cc=jgarzik@pobox.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=stern@rowland.harvard.edu \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).