From patchwork Thu Aug 30 06:40:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Lu X-Patchwork-Id: 1386601 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 48041DF264 for ; Thu, 30 Aug 2012 06:42:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752178Ab2H3Gl7 (ORCPT ); Thu, 30 Aug 2012 02:41:59 -0400 Received: from mga14.intel.com ([143.182.124.37]:51333 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751858Ab2H3Gl4 (ORCPT ); Thu, 30 Aug 2012 02:41:56 -0400 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga102.ch.intel.com with ESMTP; 29 Aug 2012 23:41:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,337,1344236400"; d="scan'208";a="139586756" Received: from aaronlu.sh.intel.com ([10.239.36.123]) by AZSMGA002.ch.intel.com with ESMTP; 29 Aug 2012 23:41:54 -0700 From: Aaron Lu To: Jeff Garzik , "James E.J. Bottomley" Cc: linux-ide@vger.kernel.org, linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org, Aaron Lu , Aaron Lu Subject: [PATCH 2/4] libata: acpi: set can_power_off for both ODD and HD Date: Thu, 30 Aug 2012 14:40:16 +0800 Message-Id: <1346308818-27039-3-git-send-email-aaron.lu@intel.com> X-Mailer: git-send-email 1.7.11.5 In-Reply-To: <1346308818-27039-1-git-send-email-aaron.lu@intel.com> References: <1346308818-27039-1-git-send-email-aaron.lu@intel.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Hard disk may also be runtime powered off, so set can_power_off flag for it too if condition satisfies. Signed-off-by: Aaron Lu --- drivers/ata/libata-acpi.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index b67b565..67a696f 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c @@ -1024,7 +1024,7 @@ static void ata_acpi_add_pm_notifier(struct ata_device *dev) if (ACPI_FAILURE(status)) return; - if (dev->sdev->can_power_off) { + if (dev->class == ATA_DEV_ATAPI && dev->sdev->can_power_off) { acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY, ata_acpi_wake_dev, dev); device_set_run_wake(&dev->sdev->sdev_gendev, true); @@ -1045,7 +1045,7 @@ static void ata_acpi_remove_pm_notifier(struct ata_device *dev) if (ACPI_FAILURE(status)) return; - if (dev->sdev->can_power_off) { + if (dev->class == ATA_DEV_ATAPI && dev->sdev->can_power_off) { device_set_run_wake(&dev->sdev->sdev_gendev, false); acpi_remove_notify_handler(handle, ACPI_SYSTEM_NOTIFY, ata_acpi_wake_dev); @@ -1152,14 +1152,23 @@ static int ata_acpi_bind_device(struct ata_port *ap, struct scsi_device *sdev, /* * If firmware has _PS3 or _PR3 for this device, - * and this ata ODD device support device attention, - * it means this device can be powered off + * it means this device can be powered off runtime */ states = acpi_dev->power.states; - if ((states[ACPI_STATE_D3_HOT].flags.valid || - states[ACPI_STATE_D3_COLD].flags.explicit_set) && - ata_dev->flags & ATA_DFLAG_DA) - sdev->can_power_off = 1; + if (states[ACPI_STATE_D3_HOT].flags.valid || + states[ACPI_STATE_D3_COLD].flags.explicit_set) { + /* + * For ODD, it needs to support device attention or + * it can't be powered up back by user + */ + if (ata_dev->class == ATA_DEV_ATAPI && + ata_dev->flags & ATA_DFLAG_DA) + sdev->can_power_off = 1; + + /* No requirement for hard disk */ + if (ata_dev->class == ATA_DEV_ATA) + sdev->can_power_off = 1; + } return 0; }