pata_amd/pata_via: de-couple programming of PIO/MWDMA and UDMA timings

bzolnier · Jeff Garzik · commit 943547abdfe9 · 2007-12-04T14:11:36.000-05:00
* Don't program UDMA timings when programming PIO or MWDMA modes. This has also a nice side-effect of fixing regression added by commit 681c80b ("libata: correct handling of SRST reset sequences") (->set_piomode method for PIO0 is called before ->cable_detect method which checks UDMA timings to get the cable type). * Bump driver version. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Tested-by: "Thomas Lindroth" <thomas.lindroth@gmail.com> Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Tejun Heo <htejun@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
@@ -25,7 +25,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_amd"
-#define DRV_VERSION "0.3.9"
+#define DRV_VERSION "0.3.10"
 
 /**
  *	timing_setup		-	shared timing computation and load
@@ -115,7 +115,8 @@ static void timing_setup(struct ata_port *ap, struct ata_device *adev, int offse
 	}
 
 	/* UDMA timing */
-	pci_write_config_byte(pdev, offset + 0x10 + (3 - dn), t);
+	if (at.udma)
+		pci_write_config_byte(pdev, offset + 0x10 + (3 - dn), t);
 }
 
 /**
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
@@ -63,7 +63,7 @@
 #include <linux/dmi.h>
 
 #define DRV_NAME "pata_via"
-#define DRV_VERSION "0.3.2"
+#define DRV_VERSION "0.3.3"
 
 /*
  *	The following comes directly from Vojtech Pavlik's ide/pci/via82cxxx
@@ -296,7 +296,7 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo
 	}
 
 	/* Set UDMA unless device is not UDMA capable */
-	if (udma_type) {
+	if (udma_type && t.udma) {
 		u8 cable80_status;
 
 		/* Get 80-wire cable detection bit */

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`#include <linux/libata.h>`
`26`	`26`
`27`	`27`	`#define DRV_NAME "pata_amd"`
`28`		`-#define DRV_VERSION "0.3.9"`
	`28`	`+#define DRV_VERSION "0.3.10"`
`29`	`29`
`30`	`30`	`/**`
`31`	`31`	`* timing_setup - shared timing computation and load`
`@@ -115,7 +115,8 @@ static void timing_setup(struct ata_port ap, struct ata_device adev, int offse`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`/* UDMA timing */`
`118`		`- pci_write_config_byte(pdev, offset + 0x10 + (3 - dn), t);`
	`118`	`+ if (at.udma)`
	`119`	`+ pci_write_config_byte(pdev, offset + 0x10 + (3 - dn), t);`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`/**`