From: Lin Ming <ming.m.lin@intel.com>
To: Jeff Garzik <jgarzik@pobox.com>, Aaron Lu <aaron.lu@amd.com>,
Holger Macht <holger@homac.de>, Matthew Garrett <mjg@redhat.com>,
Alan Cox <alan@lxorguk.ukuu.org.uk>,
David Woodhouse <David.Woodhouse@intel.com>
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org,
linux-acpi@vger.kernel.org
Subject: [PATCH v5 06/12] libata-acpi: add ata port runtime D3Cold support
Date: Mon, 18 Jun 2012 14:26:00 +0800 [thread overview]
Message-ID: <1340000766-129148-7-git-send-email-ming.m.lin@intel.com> (raw)
In-Reply-To: <1340000766-129148-1-git-send-email-ming.m.lin@intel.com>
ATA port may support runtime D3Cold state, for example, Zero-power ODD case.
This patch adds wakeup notifier and enable/disable run_wake during
supend/resume.
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
drivers/ata/libata-acpi.c | 77 ++++++++++++++++++++++++++++++++++++++++++---
drivers/ata/libata-scsi.c | 3 ++
drivers/ata/libata.h | 4 +++
3 files changed, 80 insertions(+), 4 deletions(-)
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 2887eb0..3f7d376 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -16,6 +16,7 @@
#include <linux/libata.h>
#include <linux/pci.h>
#include <linux/slab.h>
+#include <linux/pm_runtime.h>
#include <scsi/scsi_device.h>
#include "libata.h"
@@ -863,10 +864,23 @@ void ata_acpi_set_state(struct ata_port *ap, pm_message_t state)
ata_for_each_dev(dev, &ap->link, ENABLED) {
handle = ata_dev_acpi_handle(dev);
- if (handle)
- acpi_bus_set_power(handle,
- state.event == PM_EVENT_ON ?
- ACPI_STATE_D0 : ACPI_STATE_D3);
+ if (!handle)
+ continue;
+
+ if (state.event != PM_EVENT_ON) {
+ acpi_state = acpi_pm_device_sleep_state(
+ &dev->sdev->sdev_gendev, NULL);
+ if (acpi_state > 0)
+ acpi_bus_set_power(handle, acpi_state);
+ /* TBD: need to check if it's runtime pm request */
+ acpi_pm_device_run_wake(
+ &dev->sdev->sdev_gendev, true);
+ } else {
+ /* Ditto */
+ acpi_pm_device_run_wake(
+ &dev->sdev->sdev_gendev, false);
+ acpi_bus_set_power(handle, ACPI_STATE_D0);
+ }
}
handle = ata_ap_acpi_handle(ap);
@@ -966,6 +980,61 @@ void ata_acpi_on_disable(struct ata_device *dev)
ata_acpi_clear_gtf(dev);
}
+static void ata_acpi_wake_dev(acpi_handle handle, u32 event, void *context)
+{
+ struct ata_device *ata_dev = context;
+
+ if (event == ACPI_NOTIFY_DEVICE_WAKE && ata_dev &&
+ pm_runtime_suspended(&ata_dev->sdev->sdev_gendev))
+ scsi_autopm_get_device(ata_dev->sdev);
+}
+
+static void ata_acpi_add_pm_notifier(struct ata_device *dev)
+{
+ struct acpi_device *acpi_dev;
+ acpi_handle handle;
+ acpi_status status;
+
+ handle = ata_dev_acpi_handle(dev);
+ if (!handle)
+ return;
+
+ status = acpi_bus_get_device(handle, &acpi_dev);
+ if (ACPI_SUCCESS(status)) {
+ acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
+ ata_acpi_wake_dev, dev);
+ device_set_run_wake(&dev->sdev->sdev_gendev, true);
+ }
+}
+
+static void ata_acpi_remove_pm_notifier(struct ata_device *dev)
+{
+ struct acpi_device *acpi_dev;
+ acpi_handle handle;
+ acpi_status status;
+
+ handle = ata_dev_acpi_handle(dev);
+ if (!handle)
+ return;
+
+ status = acpi_bus_get_device(handle, &acpi_dev);
+ if (ACPI_SUCCESS(status)) {
+ device_set_run_wake(&dev->sdev->sdev_gendev, false);
+ acpi_remove_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
+ ata_acpi_wake_dev);
+ }
+}
+
+void ata_acpi_bind(struct ata_device *dev)
+{
+ ata_acpi_add_pm_notifier(dev);
+}
+
+void ata_acpi_unbind(struct ata_device *dev)
+{
+ ata_acpi_remove_pm_notifier(dev);
+}
+
static int compat_pci_ata(struct device *dev)
{
struct pci_dev *pdev;
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 2222635..8ec81ca 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3445,6 +3445,7 @@ void ata_scsi_scan_host(struct ata_port *ap, int sync)
if (!IS_ERR(sdev)) {
dev->sdev = sdev;
scsi_device_put(sdev);
+ ata_acpi_bind(dev);
} else {
dev->sdev = NULL;
}
@@ -3541,6 +3542,8 @@ static void ata_scsi_remove_dev(struct ata_device *dev)
mutex_lock(&ap->scsi_host->scan_mutex);
spin_lock_irqsave(ap->lock, flags);
+ ata_acpi_unbind(dev);
+
/* clearing dev->sdev is protected by host lock */
sdev = dev->sdev;
dev->sdev = NULL;
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 6aba606..b0ba924 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -118,6 +118,8 @@ extern void ata_acpi_on_disable(struct ata_device *dev);
extern void ata_acpi_set_state(struct ata_port *ap, pm_message_t state);
extern int ata_acpi_register(void);
extern void ata_acpi_unregister(void);
+extern void ata_acpi_bind(struct ata_device *dev);
+extern void ata_acpi_unbind(struct ata_device *dev);
#else
static inline void ata_acpi_dissociate(struct ata_host *host) { }
static inline int ata_acpi_on_suspend(struct ata_port *ap) { return 0; }
@@ -128,6 +130,8 @@ static inline void ata_acpi_set_state(struct ata_port *ap,
pm_message_t state) { }
static inline int ata_acpi_register(void) { return 0; }
static void ata_acpi_unregister(void) { }
+static void ata_acpi_bind(struct ata_device *dev) { }
+static void ata_acpi_unbind(struct ata_device *dev) { }
#endif
/* libata-scsi.c */
--
1.7.10
next prev parent reply other threads:[~2012-06-18 6:26 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-18 6:25 [PATCH v5 0/13] SATA ZPODD support Lin Ming
2012-06-18 6:25 ` [PATCH v5 01/12] [SCSI]: add wrapper to access and set scsi_bus_type in struct acpi_bus_type Lin Ming
2012-06-18 6:25 ` [PATCH v5 02/12] libata: bind the Linux device tree to the ACPI device tree Lin Ming
2012-06-20 23:50 ` Dan Williams
2012-06-21 1:26 ` Lin Ming
2012-06-21 3:59 ` Dan Williams
2012-06-21 6:37 ` Lin Ming
2012-06-21 15:40 ` Dan Williams
2012-06-18 6:25 ` [PATCH v5 03/12] libata: migrate ACPI code over to new bindings Lin Ming
2012-06-18 6:25 ` [PATCH v5 04/12] libata: use correct PCI devices Lin Ming
2012-06-18 11:37 ` Sergei Shtylyov
2012-06-18 12:03 ` Lin Ming
2012-06-18 6:25 ` [PATCH v5 05/12] libata-acpi: set acpi state for SATA port Lin Ming
2012-06-18 6:26 ` Lin Ming [this message]
2012-06-18 6:26 ` [PATCH v5 07/12] libata-acpi: register/unregister device to/from power resource Lin Ming
2012-06-18 6:26 ` [PATCH v5 08/12] libata: detect Device Attention support Lin Ming
2012-06-18 6:26 ` [PATCH v5 09/12] libata: tell scsi layer device supports runtime power off Lin Ming
2012-06-18 6:26 ` [PATCH v5 10/12] [SCSI] sr: check support for device busy class events Lin Ming
2012-06-18 6:26 ` [PATCH v5 11/12] [SCSI] sr: support zero power ODD Lin Ming
2012-06-18 6:26 ` [PATCH v5 12/12] [SCSI] sr: make sure ODD is in resumed state in block ioctl Lin Ming
2012-06-18 6:32 ` [PATCH v5 00/12] SATA ZPODD support Lin Ming
2012-06-22 18:41 ` [PATCH v5 0/13] " Jeff Garzik
2012-06-23 1:05 ` 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=1340000766-129148-7-git-send-email-ming.m.lin@intel.com \
--to=ming.m.lin@intel.com \
--cc=David.Woodhouse@intel.com \
--cc=aaron.lu@amd.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=holger@homac.de \
--cc=jgarzik@pobox.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=mjg@redhat.com \
/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).