lkml.org 
[lkml]   [2012]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RESEND PATCH v2 2/3] ahci: add runtime PM callbacks
Date
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


\
 
 \ /
  Last update: 2012-02-15 11:21    [W:0.078 / U:0.612 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site