From patchwork Wed Mar 28 06:21:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ming X-Patchwork-Id: 149153 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3D24AB6EE7 for ; Wed, 28 Mar 2012 17:24:42 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751592Ab2C1GWw (ORCPT ); Wed, 28 Mar 2012 02:22:52 -0400 Received: from mga02.intel.com ([134.134.136.20]:29776 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751580Ab2C1GWu (ORCPT ); Wed, 28 Mar 2012 02:22:50 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 27 Mar 2012 23:22:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,352,1309762800"; d="scan'208";a="122519252" Received: from minggr.sh.intel.com ([10.239.36.45]) by orsmga001.jf.intel.com with ESMTP; 27 Mar 2012 23:22:47 -0700 From: Lin Ming To: Zhang Rui , Jeff Garzik , Alan Stern , "Rafael J. Wysocki" , Tejun Heo , Aaron Lu Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org, linux-pm@vger.kernel.org, linux-acpi Subject: [PATCH v3 2/7] libata-acpi: add ata port runtime D3Cold support Date: Wed, 28 Mar 2012 14:21:57 +0800 Message-Id: <1332915722-15963-3-git-send-email-ming.m.lin@intel.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1332915722-15963-1-git-send-email-ming.m.lin@intel.com> References: <1332915722-15963-1-git-send-email-ming.m.lin@intel.com> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org 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 --- drivers/ata/libata-acpi.c | 82 +++++++++++++++++++++++++++++++++++++++++--- drivers/ata/libata-scsi.c | 6 ++-- drivers/ata/libata.h | 8 ++-- 3 files changed, 83 insertions(+), 13 deletions(-) diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index 104c1d0..ba9382a 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include "libata.h" @@ -852,10 +853,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); + if (ap->tdev.power.request == RPM_REQ_SUSPEND) + acpi_pm_device_run_wake( + &dev->sdev->sdev_gendev, true); + } else { + if (ap->tdev.power.request == RPM_REQ_RESUME) + acpi_pm_device_run_wake( + &dev->sdev->sdev_gendev, false); + acpi_bus_set_power(handle, ACPI_STATE_D0); + } } handle = ata_ap_acpi_handle(ap); @@ -955,7 +969,7 @@ void ata_acpi_on_disable(struct ata_device *dev) ata_acpi_clear_gtf(dev); } -void ata_acpi_bind_dock(struct ata_device *dev) +static void ata_acpi_bind_dock(struct ata_device *dev) { struct device **docks; @@ -965,7 +979,7 @@ void ata_acpi_bind_dock(struct ata_device *dev) kfree(docks); } -void ata_acpi_unbind_dock(struct ata_device *dev) +static void ata_acpi_unbind_dock(struct ata_device *dev) { struct device **docks; @@ -975,6 +989,62 @@ void ata_acpi_unbind_dock(struct ata_device *dev) kfree(docks); } +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) + 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_bind_dock(dev); + ata_acpi_add_pm_notifier(dev); +} + +void ata_acpi_unbind(struct ata_device *dev) +{ + ata_acpi_unbind_dock(dev); + ata_acpi_remove_pm_notifier(dev); +} + static int is_pci_ata(struct device *dev) { struct pci_dev *pdev; diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index f08c447..231c3ec 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -3444,7 +3444,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_dock(dev); + ata_acpi_bind(dev); } else { dev->sdev = NULL; } @@ -3541,12 +3541,12 @@ 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; - ata_acpi_unbind_dock(dev); - if (sdev) { /* If user initiated unplug races with us, sdev can go * away underneath us after the host lock and diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h index e61ba10..2ec7c38 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h @@ -117,8 +117,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_dock(struct ata_device *dev); -extern void ata_acpi_unbind_dock(struct ata_device *dev); +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; } @@ -129,8 +129,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_dock(struct ata_device *dev) { } -static void ata_acpi_unbind_dock(struct ata_device *dev) { } +static void ata_acpi_bind(struct ata_device *dev) { } +static void ata_acpi_unbind(struct ata_device *dev) { } #endif /* libata-scsi.c */