From: Randy Dunlap <randy_d_dunlap@linux.intel.com>
To: lkml <linux-kernel@vger.kernel.org>
Cc: linux-ide@vger.kernel.org, akpm@osdl.org, jgarzik@pobox.com
Subject: [PATCH 10/13] ATA ACPI: do taskfile before mode commands
Date: Wed, 22 Feb 2006 14:01:40 -0800 [thread overview]
Message-ID: <20060222140140.0d9e41b7.randy_d_dunlap@linux.intel.com> (raw)
In-Reply-To: <20060222133241.595a8509.randy_d_dunlap@linux.intel.com>
From: Randy Dunlap <randy_d_dunlap@linux.intel.com>
Do drive/taskfile-specific commands before setting the drive mode.
This allows the taskfile to unlock the drive before trying to
set the drive mode.
Signed-off-by: Randy Dunlap <randy_d_dunlap@linux.intel.com>
---
drivers/scsi/libata-core.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
--- linux-2616-rc4-ata.orig/drivers/scsi/libata-core.c
+++ linux-2616-rc4-ata/drivers/scsi/libata-core.c
@@ -4297,13 +4297,17 @@ static int ata_start_drive(struct ata_po
*/
int ata_device_resume(struct ata_port *ap, struct ata_device *dev)
{
+ printk(KERN_DEBUG "ata%d: resume device\n", ap->id);
+
+ WARN_ON (irqs_disabled());
+
+ if (!ata_dev_present(dev))
+ return 0;
+ ata_acpi_exec_tfs(ap);
if (ap->flags & ATA_FLAG_SUSPENDED) {
ap->flags &= ~ATA_FLAG_SUSPENDED;
ata_set_mode(ap);
}
- if (!ata_dev_present(dev))
- return 0;
- ata_acpi_exec_tfs(ap);
if (dev->class == ATA_DEV_ATA)
ata_start_drive(ap, dev);
@@ -4319,6 +4323,7 @@ int ata_device_resume(struct ata_port *a
*/
int ata_device_suspend(struct ata_port *ap, struct ata_device *dev)
{
+ printk(KERN_DEBUG "ata%d: suspend device\n", ap->id);
if (!ata_dev_present(dev))
return 0;
if (dev->class == ATA_DEV_ATA)
@@ -5099,6 +5104,7 @@ int pci_test_config_bits(struct pci_dev
int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t state)
{
+ dev_printk(KERN_DEBUG, &pdev->dev, "suspend PCI device\n");
pci_save_state(pdev);
pci_disable_device(pdev);
pci_set_power_state(pdev, PCI_D3hot);
@@ -5107,6 +5113,7 @@ int ata_pci_device_suspend(struct pci_de
int ata_pci_device_resume(struct pci_dev *pdev)
{
+ dev_printk(KERN_DEBUG, &pdev->dev, "resume PCI device\n");
pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
pci_enable_device(pdev);
next prev parent reply other threads:[~2006-02-22 22:11 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20060222133241.595a8509.randy_d_dunlap@linux.intel.com>
2006-02-22 21:40 ` [PATCH 1/13] ATA ACPI: Makefile/Kconfig/doc Randy Dunlap
2006-02-22 21:51 ` [PATCH 2/13] ATA ACPI: debugging infrastructure Randy Dunlap
2006-02-28 11:45 ` Pavel Machek
2006-02-28 12:00 ` Jeff Garzik
2006-02-28 12:04 ` Pavel Machek
2006-02-28 12:13 ` Jeff Garzik
2006-02-28 12:18 ` Andrew Morton
2006-02-28 12:31 ` Jeff Garzik
2006-02-28 18:35 ` Andrew Morton
2006-02-28 19:27 ` Jeff Garzik
2006-02-28 14:43 ` Mark Lord
2006-02-28 19:22 ` Randy Dunlap
2006-02-28 17:10 ` Phillip Susi
2006-03-01 10:29 ` James Courtier-Dutton
2006-03-01 10:45 ` Andrew Morton
2006-02-22 21:52 ` [PATCH 3/13] ATA ACPI: SATA methods Randy Dunlap
2006-02-22 21:54 ` [PATCH 4/13] ATA ACPI: add params/docs Randy Dunlap
2006-02-28 11:46 ` Pavel Machek
2006-02-28 11:57 ` Jeff Garzik
2006-02-22 21:55 ` [PATCH 5/13] ATA ACPI: use debugging macros Randy Dunlap
2006-02-28 11:47 ` Pavel Machek
2006-02-28 11:58 ` Jeff Garzik
2006-02-22 21:56 ` [PATCH 6/13] ATA ACPI: use correct acpi_object pointer Randy Dunlap
2006-02-22 21:58 ` [PATCH 7/13] ATA ACPI: more Makefile/Kconfig Randy Dunlap
2006-02-28 11:49 ` Pavel Machek
2006-02-28 12:03 ` Jeff Garzik
2006-02-28 15:27 ` Randy.Dunlap
2006-02-22 21:58 ` [PATCH 8/13] ATA ACPI: PATA methods Randy Dunlap
2006-02-28 11:55 ` Pavel Machek
2006-02-28 12:02 ` Jeff Garzik
2006-02-22 22:00 ` [PATCH 9/13] ATA ACPI: check SATA/PATA more carefully Randy Dunlap
2006-02-23 0:30 ` Alan Cox
2006-02-22 22:01 ` Randy Dunlap [this message]
2006-02-28 11:57 ` [PATCH 10/13] ATA ACPI: do taskfile before mode commands Pavel Machek
2006-02-28 12:05 ` Jeff Garzik
2006-02-28 12:08 ` Pavel Machek
2006-02-28 12:14 ` Jeff Garzik
2006-02-22 22:02 ` [PATCH 11/13] ATA ACPI: fix pata host typo Randy Dunlap
2006-02-22 22:06 ` [PATCH 12/13] ATA ACPI: use scsi_bus_shutdown for SATA/PATA Randy Dunlap
2006-02-28 11:58 ` Pavel Machek
2006-02-28 19:44 ` Randy Dunlap
2006-02-28 20:22 ` Pavel Machek
2006-02-22 22:07 ` [PATCH 13/13] ATA ACPI: enable writing PATA taskfiles Randy Dunlap
2006-02-28 11:59 ` Pavel Machek
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=20060222140140.0d9e41b7.randy_d_dunlap@linux.intel.com \
--to=randy_d_dunlap@linux.intel.com \
--cc=akpm@osdl.org \
--cc=jgarzik@pobox.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.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).