rpms/kernel/devel linux-2.6-sata-fix-via.patch, NONE, 1.1 kernel-2.6.spec, 1.2934, 1.2935

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-sata-fix-via.patch 
Log Message:
fix via sata

linux-2.6-sata-fix-via.patch:
 sata_via.c |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

--- NEW FILE linux-2.6-sata-fix-via.patch ---
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index baca6d7..fe9101a 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -423,16 +423,21 @@ static struct ata_probe_ent *vt6420_init_probe_ent(struct pci_dev *pdev)
 {
 	struct ata_probe_ent *probe_ent;
 	struct ata_port_info *ppi[2];
-	void __iomem * const *iomap;
+	void __iomem *bar5;
 
 	ppi[0] = ppi[1] = &vt6420_port_info;
 	probe_ent = ata_pci_init_native_mode(pdev, ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
 	if (!probe_ent)
 		return NULL;
 
-	iomap = pcim_iomap_table(pdev);
-	probe_ent->port[0].scr_addr = svia_scr_addr(iomap[5], 0);
-	probe_ent->port[1].scr_addr = svia_scr_addr(iomap[5], 1);
+	bar5 = pcim_iomap(pdev, 5, 0);
+	if (!bar5) {
+		dev_printk(KERN_ERR, &pdev->dev, "failed to iomap PCI BAR 5\n");
+		return NULL;
+	}
+
+	probe_ent->port[0].scr_addr = svia_scr_addr(bar5, 0);
+	probe_ent->port[1].scr_addr = svia_scr_addr(bar5, 1);
 
 	return probe_ent;
 }
@@ -460,6 +465,13 @@ static struct ata_probe_ent *vt6421_init_probe_ent(struct pci_dev *pdev)
 	probe_ent->mwdma_mask	= 0x07;
 	probe_ent->udma_mask	= 0x7f;
 
+	for (i = 0; i < 6; i++)
+		if (!pcim_iomap(pdev, i, 0)) {
+			dev_printk(KERN_ERR, &pdev->dev,
+				   "failed to iomap PCI BAR %d\n", i);
+			return NULL;
+		}
+
 	for (i = 0; i < N_PORTS; i++)
 		vt6421_init_addrs(probe_ent, pcim_iomap_table(pdev), i);
 
@@ -522,7 +534,7 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 	if (rc)
 		return rc;
 
-	rc = pcim_iomap_regions(pdev, 0x1f, DRV_NAME);
+	rc = pci_request_regions(pdev, DRV_NAME);
 	if (rc) {
 		pcim_pin_device(pdev);
 		return rc;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2934
retrieving revision 1.2935
diff -u -r1.2934 -r1.2935
--- kernel-2.6.spec	18 Feb 2007 02:52:57 -0000	1.2934
+++ kernel-2.6.spec	18 Feb 2007 02:56:17 -0000	1.2935
@@ -450,7 +450,7 @@
 # SATA Bits
 Patch2200: linux-2.6-sata-promise-pata-ports.patch
 Patch2201: linux-2.6-sata-ahci-suspend.patch
-Patch2202: linux-2.6-sata-sg_init_one-oops.patch
+Patch2203: linux-2.6-sata-fix-via.patch
 
 # ACPI bits
 
@@ -1098,6 +1098,9 @@
 # Fix AHCI Suspend.
 #%patch2201 -p1
 # libata: don't initialize sg in ata_exec_internal() if DMA_NONE
+# Fix up VIA SATA
+%patch2203 -p1
+
 
 # ACPI patches
 
@@ -2021,6 +2024,7 @@
 %changelog
 * Sat Feb 17 2007 Dave Jones <davej at redhat.com>
 - 2.6.20-git14  (Now tickless).
+- Fix up VIA SATA.
 
 * Wed Feb 14 2007 Adam Jackson <ajax at redhat.com>
 - nouveau drm