aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorAaron Lu <aaron.lu@intel.com>2013-01-15 04:21:02 -0500
committerJeff Garzik <jgarzik@redhat.com>2013-01-21 15:42:15 -0500
commita59b9aae230316134597775c6202cf28f6da0333 (patch)
tree0982779c88d00690a37fbc0ec8304fd854b1a534 /drivers/ata
parent213342053db58eabdaddff9c036c2b81ca63c443 (diff)
libata: expose pm qos flags for ata device
Expose pm qos flags to user space so that user has a chance to disable ZPODD feature, if he/she has a broken platform or devices or simply does not like this feature. This flag is exposed to user space only for ZPODD devices. Due to this flag, it is possible the ODD is ZP ready but we didn't power it off. So the zp_ready flag will need to be cleared whenever we found the ODD is not in ZP ready state. Previously, once zp_ready is set, the ODD will always be powered off and the flag will be cleared in post_poweron. But this is no longer the case now. Signed-off-by: Aaron Lu <aaron.lu@intel.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-acpi.c3
-rw-r--r--drivers/ata/libata-zpodd.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 6f72c648ea14..97094496127e 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -17,6 +17,7 @@
17#include <linux/pci.h> 17#include <linux/pci.h>
18#include <linux/slab.h> 18#include <linux/slab.h>
19#include <linux/pm_runtime.h> 19#include <linux/pm_runtime.h>
20#include <linux/pm_qos.h>
20#include <scsi/scsi_device.h> 21#include <scsi/scsi_device.h>
21#include "libata.h" 22#include "libata.h"
22 23
@@ -1022,6 +1023,8 @@ static void ata_acpi_unregister_power_resource(struct ata_device *dev)
1022void ata_acpi_bind(struct ata_device *dev) 1023void ata_acpi_bind(struct ata_device *dev)
1023{ 1024{
1024 ata_acpi_register_power_resource(dev); 1025 ata_acpi_register_power_resource(dev);
1026 if (zpodd_dev_enabled(dev))
1027 dev_pm_qos_expose_flags(&dev->sdev->sdev_gendev, 0);
1025} 1028}
1026 1029
1027void ata_acpi_unbind(struct ata_device *dev) 1030void ata_acpi_unbind(struct ata_device *dev)
diff --git a/drivers/ata/libata-zpodd.c b/drivers/ata/libata-zpodd.c
index 1f5d52ae3974..540b0b7904fb 100644
--- a/drivers/ata/libata-zpodd.c
+++ b/drivers/ata/libata-zpodd.c
@@ -150,6 +150,7 @@ void zpodd_on_suspend(struct ata_device *dev)
150 150
151 if (!zpready(dev)) { 151 if (!zpready(dev)) {
152 zpodd->zp_sampled = false; 152 zpodd->zp_sampled = false;
153 zpodd->zp_ready = false;
153 return; 154 return;
154 } 155 }
155 156