rpms/kernel/devel kernel-2.6.spec, 1.2150, 1.2151 linux-2.6-sata-ahci-suspend.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5009

Modified Files:
	kernel-2.6.spec linux-2.6-sata-ahci-suspend.patch 
Log Message:
SATA S3 fix. Jeff doesn't like this, but it makes stuff work for the time-being.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2150
retrieving revision 1.2151
diff -u -r1.2150 -r1.2151
--- kernel-2.6.spec	22 Apr 2006 17:48:28 -0000	1.2150
+++ kernel-2.6.spec	22 Apr 2006 23:46:16 -0000	1.2151
@@ -1660,6 +1660,9 @@
 %endif
 
 %changelog
+* Sat Apr 22 2006 Dave Jones <davej at redhat.com>
+- Ugly SATA suspend/resume hack de jour.
+
 * Sat Apr 22 2006 Juan Quintela <quintela at redhat.com>
 - rebase xen.
 - fix x86_64 xen (thanks chris).

linux-2.6-sata-ahci-suspend.patch:
 linux-2.6.16.noarch/drivers/scsi/libata-core.c |    1 
 linux-ahci.suspend/drivers/scsi/ahci.c         |  194 ++++++++++++++++++-------
 2 files changed, 142 insertions(+), 53 deletions(-)

Index: linux-2.6-sata-ahci-suspend.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-sata-ahci-suspend.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-sata-ahci-suspend.patch	21 Apr 2006 03:21:12 -0000	1.1
+++ linux-2.6-sata-ahci-suspend.patch	22 Apr 2006 23:46:16 -0000	1.2
@@ -280,3 +280,13 @@
  static void ahci_setup_port(struct ata_ioports *port, unsigned long base,
  			    unsigned int port_idx)
  {
+--- linux-2.6.16.noarch/drivers/scsi/libata-core.c~	2006-04-22 18:43:24.000000000 -0500
++++ linux-2.6.16.noarch/drivers/scsi/libata-core.c	2006-04-22 18:43:39.000000000 -0500
+@@ -4288,6 +4288,7 @@ int ata_device_resume(struct ata_port *a
+ {
+ 	if (ap->flags & ATA_FLAG_SUSPENDED) {
+ 		ap->flags &= ~ATA_FLAG_SUSPENDED;
++		ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT);
+ 		ata_set_mode(ap);
+ 	}
+ 	if (!ata_dev_present(dev))