ata: add ata port runtime PM callbacks

Add ata port runtime suspend/resume/idle callbacks.
Set ->eh_noresume to skip the runtime PM calls on scsi host
in the error handler to avoid dead lock.

Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 04c208e3cec6205f554655801c9a694720b0dd1c..15a3d4deb272ac94f8b55405b182223ae462af41 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -66,6 +66,7 @@
 #include <asm/byteorder.h>
 #include <linux/cdrom.h>
 #include <linux/ratelimit.h>
+#include <linux/pm_runtime.h>
 
 #include "libata.h"
 #include "libata-transport.h"
@@ -5307,9 +5308,18 @@ static int ata_port_resume(struct device *dev)
        return rc;
 }
 
+static int ata_port_runtime_idle(struct device *dev)
+{
+       return pm_runtime_suspend(dev);
+}
+
 static const struct dev_pm_ops ata_port_pm_ops = {
        .suspend = ata_port_suspend,
        .resume = ata_port_resume,
+
+       .runtime_suspend = ata_port_suspend_common,
+       .runtime_resume = ata_port_resume,
+       .runtime_idle = ata_port_runtime_idle,
 };
 
 /**

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 7ae1e771d950c3326b4f0bdfe52e384d4a909cab..508a60bfe5c12655353eb2eed6c15690bdb293e5 100644 (file)
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3381,6 +3381,7 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht)
                if (!shost)
                        goto err_alloc;
 
+               shost->eh_noresume = 1;
                *(struct ata_port **)&shost->hostdata[0] = ap;
                ap->scsi_host = shost;
 

diff --git a/drivers/ata/libata-transport.c b/drivers/ata/libata-transport.c
index 3ceb3d94be26678c4eddb3e96b0af90c97d82d5a..9a7f0ea565df6c6066d7e64465c8385b81014a01 100644 (file)
--- a/drivers/ata/libata-transport.c
+++ b/drivers/ata/libata-transport.c
@@ -32,6 +32,7 @@
 #include <linux/libata.h>
 #include <linux/hdreg.h>
 #include <linux/uaccess.h>
+#include <linux/pm_runtime.h>
 
 #include "libata.h"
 #include "libata-transport.h"
@@ -290,6 +291,9 @@ int ata_tport_add(struct device *parent,
                goto tport_err;
        }
 
+       pm_runtime_set_active(dev);
+       pm_runtime_enable(dev);
+
        transport_add_device(dev);
        transport_configure_device(dev);