From: Lin Ming <ming.m.lin@intel.com>
To: Zhang Rui <rui.zhang@intel.com>, Jeff Garzik <jgarzik@pobox.com>,
Alan Stern <stern@rowland.harvard.edu>,
"Rafael J. Wysocki" <rjw@sisk.pl>, Tejun Heo <tj@kernel.org>,
Aaron Lu <aaron.lu@amd.com>
Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org,
linux-scsi@vger.kernel.org, linux-pm@vger.kernel.org,
linux-acpi <linux-acpi@vger.kernel.org>
Subject: [PATCH v3 1/7] libata-acpi: set acpi state for SATA port
Date: Wed, 28 Mar 2012 14:21:56 +0800 [thread overview]
Message-ID: <1332915722-15963-2-git-send-email-ming.m.lin@intel.com> (raw)
In-Reply-To: <1332915722-15963-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 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index b03e468..104c1d0 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -841,23 +841,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.2.5
next prev parent reply other threads:[~2012-03-28 6:21 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-28 6:21 [PATCH v3 0/7] SATA ZPODD support Lin Ming
2012-03-28 6:21 ` Lin Ming [this message]
2012-03-28 19:55 ` [PATCH v3 1/7] libata-acpi: set acpi state for SATA port Aaron Lu
2012-03-28 7:57 ` Lin Ming
2012-03-28 6:21 ` [PATCH v3 2/7] libata-acpi: add ata port runtime D3Cold support Lin Ming
2012-03-28 6:21 ` [PATCH v3 3/7] libata-acpi: register/unregister device to/from power resource Lin Ming
2012-03-28 6:21 ` [PATCH v3 4/7] libata: detech Device Attention support Lin Ming
2012-03-28 11:22 ` Sergei Shtylyov
2012-03-29 5:06 ` Lin Ming
2012-03-29 11:14 ` Sergei Shtylyov
2012-03-29 11:18 ` Lin Ming
2012-03-28 6:22 ` [PATCH v3 5/7] libata: tell scsi layer device supports runtime power off Lin Ming
2012-03-28 6:22 ` [PATCH v3 6/7] PM / Runtime: Add can_power_off flag to subsys data Lin Ming
2012-03-28 6:22 ` [PATCH v3 7/7] [SCSI] sr: adds Zero-power ODD support Lin Ming
2012-03-28 14:33 ` Alan Stern
2012-03-29 5:45 ` Lin Ming
2012-03-29 13:50 ` Aaron Lu
2012-03-29 15:00 ` Alan Stern
2012-03-30 1:07 ` Aaron Lu
2012-03-30 14:28 ` Alan Stern
2012-03-31 10:45 ` Jan Ceuleers
2012-04-01 10:34 ` Aaron Lu
2012-04-05 6:00 ` Lin Ming
2012-04-05 8:32 ` Aaron Lu
2012-04-05 8:48 ` Lin Ming
2012-04-05 14:03 ` Alan Stern
2012-04-06 6:13 ` Lin Ming
2012-04-06 6:10 ` Lin Ming
2012-04-06 16:01 ` Aaron Lu
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=1332915722-15963-2-git-send-email-ming.m.lin@intel.com \
--to=ming.m.lin@intel.com \
--cc=aaron.lu@amd.com \
--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=rjw@sisk.pl \
--cc=rui.zhang@intel.com \
--cc=stern@rowland.harvard.edu \
--cc=tj@kernel.org \
/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).