rpms/kernel/F-8 linux-2.6-libata-pata_atiixp-dont-disable.patch, NONE, 1.1 kernel.spec, 1.457, 1.458

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7737

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-libata-pata_atiixp-dont-disable.patch 
Log Message:
* Tue Jun 05 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.4-18
- Make DMA work again on atiixp PATA devices (#437163)


linux-2.6-libata-pata_atiixp-dont-disable.patch:

--- NEW FILE linux-2.6-libata-pata_atiixp-dont-disable.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=05177f178efe1459d2d0ac05430027ba201889a4
Commit:     05177f178efe1459d2d0ac05430027ba201889a4
Parent:     22bfc6d5e19b72d50535ce32fd6dee2ce2e75775
Author:     Alan Cox <alan at lxorguk.ukuu.org.uk>
AuthorDate: Fri May 2 15:13:39 2008 -0700
Committer:  Jeff Garzik <jgarzik at redhat.com>
CommitDate: Tue May 6 11:43:44 2008 -0400

    pata_atiixp: Don't disable
    
    A couple of distributions (Fedora, Ubuntu) were having weird problems with the
    ATI IXP series PATA controllers being reported as simplex.  At the heart of
    the problem is that both distros ignored the recommendations to load pata_acpi
    and ata_generic *AFTER* specific host drivers.
    
    The underlying cause however is that if you D3 and then D0 an ATI IXP it
    helpfully throws away some configuration and won't let you rewrite it.
    
    Add checks to ata_generic and pata_acpi to pin ATIIXP devices.  Possibly the
    real answer here is to quirk them and pin them, but right now we can't do that
    before they've been pcim_enable()'d by a driver.
    
    I'm indebted to David Gero for this.  His bug report not only reported the
    problem but identified the cause correctly and he had tested the right values
    to prove what was going on
    
    [If you backport this for 2.6.24 you will need to pull in the 2.6.25
    removal of the bogus WARN_ON() in pcim_enagle]
    
    Signed-off-by: Alan Cox <alan at redhat.com>
    Tested-by: David Gero <davidg at havidave.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---
 drivers/ata/ata_generic.c |    6 ++++++
 drivers/ata/pata_acpi.c   |    6 ++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index 47aeccd..75a406f 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -152,6 +152,12 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id
 	if (dev->vendor == PCI_VENDOR_ID_AL)
 	    	ata_pci_clear_simplex(dev);
 
+	if (dev->vendor == PCI_VENDOR_ID_ATI) {
+		int rc = pcim_enable_device(dev);
+		if (rc < 0)
+			return rc;
+		pcim_pin_device(dev);
+	}
 	return ata_pci_init_one(dev, ppi);
 }
 
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index c5f91e6..fbe6057 100644
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -259,6 +259,12 @@ static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
 		.port_ops	= &pacpi_ops,
 	};
 	const struct ata_port_info *ppi[] = { &info, NULL };
+	if (pdev->vendor == PCI_VENDOR_ID_ATI) {
+		int rc = pcim_enable_device(pdev);
+		if (rc < 0)
+			return rc;
+		pcim_pin_device(pdev);
+	}
 	return ata_pci_init_one(pdev, ppi);
 }
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -r1.457 -r1.458
--- kernel.spec	5 Jun 2008 16:14:15 -0000	1.457
+++ kernel.spec	6 Jun 2008 00:30:35 -0000	1.458
@@ -640,6 +640,7 @@
 Patch673: linux-2.6-libata-be-a-bit-more-slack-about-early-devices.patch
 Patch674: linux-2.6-sata-eeepc-faster.patch
 Patch675: linux-2.6-libata-acpi-handle-bay-devices-in-dock-stations.patch
+Patch676: linux-2.6-libata-pata_atiixp-dont-disable.patch
 
 Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
@@ -1152,6 +1153,8 @@
 ApplyPatch linux-2.6-sata-eeepc-faster.patch
 # fix docking on stations that have a bay device
 ApplyPatch linux-2.6-libata-acpi-handle-bay-devices-in-dock-stations.patch
+# fix DMA disable on atiixp
+ApplyPatch linux-2.6-libata-pata_atiixp-dont-disable.patch
 
 # wireless
 #
@@ -1827,6 +1830,9 @@
 
 
 %changelog
+* Tue Jun 05 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.4-18
+- Make DMA work again on atiixp PATA devices (#437163)
+
 * Tue Jun 05 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.4-17
 - Fix docking when docking station has a bay device (bug reported on IRC.)