]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
.32 patch
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 7 Apr 2010 17:22:17 +0000 (10:22 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 7 Apr 2010 17:22:17 +0000 (10:22 -0700)
queue-2.6.32/pata_ali-fix-regression-with-old-devices.patch [new file with mode: 0644]
queue-2.6.32/series

diff --git a/queue-2.6.32/pata_ali-fix-regression-with-old-devices.patch b/queue-2.6.32/pata_ali-fix-regression-with-old-devices.patch
new file mode 100644 (file)
index 0000000..e25437f
--- /dev/null
@@ -0,0 +1,37 @@
+From d6250a03fa736c1bff4df4601f5af2dc21f2bf9e Mon Sep 17 00:00:00 2001
+From: Alan Cox <alan@linux.intel.com>
+Date: Mon, 30 Nov 2009 13:23:05 +0000
+Subject: pata_ali: Fix regression with old devices
+
+From: Alan Cox <alan@linux.intel.com>
+
+commit d6250a03fa736c1bff4df4601f5af2dc21f2bf9e upstream.
+
+Making the new stuff work broke some of the old chipsets. We need to go
+back to the old set up values for these it seems. Unfortunately even with
+documentation this is basically a mix of cargoculting and guesswork.
+
+Chased down to the exact line by Gianluca.
+
+Signed-off-by: Alan Cox <alan@linux.intel.com>
+Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
+Cc: Christoph Biedl <linux-kernel.bfrz@manchmal.in-ulm.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/ata/pata_ali.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/ata/pata_ali.c
++++ b/drivers/ata/pata_ali.c
+@@ -453,7 +453,9 @@ static void ali_init_chipset(struct pci_
+                       /* Clear CD-ROM DMA write bit */
+                       tmp &= 0x7F;
+               /* Cable and UDMA */
+-              pci_write_config_byte(pdev, 0x4B, tmp | 0x09);
++              if (pdev->revision >= 0xc2)
++                      tmp |= 0x01;
++              pci_write_config_byte(pdev, 0x4B, tmp | 0x08);
+               /*
+                * CD_ROM DMA on (0x53 bit 0). Enable this even if we want
+                * to use PIO. 0x53 bit 1 (rev 20 only) - enable FIFO control
index e85148eea253cc16a47b7640433316fcd291d8c2..9d4f7112977953f4d729ce8fe3a4c4f6db696a80 100644 (file)
@@ -40,3 +40,4 @@ watchdog-itco_wdt-tco-watchdog-patch-for-additional-intel-cougar-point-deviceids
 genirq-force-msi-irq-handlers-to-run-with-interrupts-disabled.patch
 tty-release_one_tty-forgets-to-put-pids.patch
 lis3-fix-show-rate-for-8-bits-chips.patch
+pata_ali-fix-regression-with-old-devices.patch