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 05/12] libata-acpi: set acpi state for SATA port
Date: Mon, 18 Jun 2012 14:25:59 +0800 [thread overview]
Message-ID: <1340000766-129148-6-git-send-email-ming.m.lin@intel.com> (raw)
In-Reply-To: <1340000766-129148-1-git-send-email-ming.m.lin@intel.com>
Currently, ata_acpi_set_state() only sets acpi sate for IDE port.
Remove this limitation.
Acked-by: Aaron Lu <aaron.lu@amd.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
drivers/ata/libata-acpi.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 98826e96..2887eb0 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -852,23 +852,26 @@ void ata_acpi_on_resume(struct ata_port *ap)
void ata_acpi_set_state(struct ata_port *ap, pm_message_t state)
{
struct ata_device *dev;
-
- if (!ata_ap_acpi_handle(ap) || (ap->flags & ATA_FLAG_ACPI_SATA))
- return;
+ acpi_handle handle;
+ int acpi_state;
/* channel first and then drives for power on and vica versa
for power off */
- if (state.event == PM_EVENT_ON)
- acpi_bus_set_power(ata_ap_acpi_handle(ap), ACPI_STATE_D0);
+ handle = ata_ap_acpi_handle(ap);
+ if (handle && state.event == PM_EVENT_ON)
+ acpi_bus_set_power(handle, ACPI_STATE_D0);
ata_for_each_dev(dev, &ap->link, ENABLED) {
- if (ata_dev_acpi_handle(dev))
- acpi_bus_set_power(ata_dev_acpi_handle(dev),
+ 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 (state.event != PM_EVENT_ON)
- acpi_bus_set_power(ata_ap_acpi_handle(ap), ACPI_STATE_D3);
+
+ handle = ata_ap_acpi_handle(ap);
+ if (handle && state.event != PM_EVENT_ON)
+ acpi_bus_set_power(handle, ACPI_STATE_D3);
}
/**
--
1.7.10
next prev parent reply other threads:[~2012-06-18 6:25 UTC|newest]
Thread overview: 26+ 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 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 12:03 ` Lin Ming
2012-06-18 6:25 ` Lin Ming [this message]
2012-06-18 6:26 ` [PATCH v5 06/12] libata-acpi: add ata port runtime D3Cold support Lin Ming
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-18 6:32 ` 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-6-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.