ide: IORDY handling fixes

Add ide_pio_need_iordy() helper and convert host drivers to use it. This fixes it8172, it8213, pdc202xx_old, piix, slc90e66 and siimage host drivers to handle IORDY correctly. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

ide: IORDY handling fixes
Add ide_pio_need_iordy() helper and convert host drivers to use it. This fixes it8172, it8213, pdc202xx_old, piix, slc90e66 and siimage host drivers to handle IORDY correctly. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Bartlomiej Zolnierkiewicz
1 parent 6dae44f9a5
Showing 10 changed files with 22 additions and 16 deletions Side-by-side Diff
drivers/ide/at91_ide.c
drivers/ide/ide-xfer-mode.c
drivers/ide/it8172.c
drivers/ide/it8213.c
drivers/ide/pdc202xx_old.c
drivers/ide/piix.c
drivers/ide/siimage.c
drivers/ide/sl82c105.c
drivers/ide/slc90e66.c
include/linux/ide.h
@@ -185,8 +185,7 @@
 	timing = ide_timing_find_mode(XFER_PIO_0 + pio);
 	BUG_ON(!timing);
  
-	if ((pio > 2 || ata_id_has_iordy(drive->id)) &&
-	    !(ata_id_is_cfa(drive->id) && pio > 4))
+	if (ide_pio_need_iordy(drive, pio))
 		use_iordy = 1;
  
 	apply_timings(chipselect, pio, timing, use_iordy);
@@ -107,6 +107,12 @@
 }
 EXPORT_SYMBOL_GPL(ide_get_best_pio_mode);
  
+int ide_pio_need_iordy(ide_drive_t *drive, const u8 pio)
+{
+	return ata_id_pio_need_iordy(drive->id, pio);
+}
+EXPORT_SYMBOL_GPL(ide_pio_need_iordy);
+
 int ide_set_pio_mode(ide_drive_t *drive, const u8 mode)
 {
 	ide_hwif_t *hwif = drive->hwif;
@@ -66,7 +66,7 @@
 	if (drive->media == ide_disk)
 		/* enable prefetch */
 		drive_enables |= 0x0004 << (drive->dn * 4);
-	if (ata_id_has_iordy(drive->id))
+	if (ide_pio_need_iordy(drive, pio))
 		/* enable IORDY sample-point */
 		drive_enables |= 0x0002 << (drive->dn * 4);
  
@@ -50,7 +50,7 @@
 		control |= 1;	/* Programmable timing on */
 	if (drive->media != ide_disk)
 		control |= 4;	/* ATAPI */
-	if (pio > 2)
+	if (ide_pio_need_iordy(drive, pio))
 		control |= 2;	/* IORDY */
 	if (is_slave) {
 		master_data |=  0x4000;
@@ -73,7 +73,7 @@
 		 * Prefetch_EN / IORDY_EN / PA[3:0] bits of register A
 		 */
 		AP &= ~0x3f;
-		if (ata_id_iordy_disable(drive->id))
+		if (ide_pio_need_iordy(drive, speed - XFER_PIO_0))
 			AP |= 0x20;	/* set IORDY_EN bit */
 		if (drive->media == ide_disk)
 			AP |= 0x10;	/* set Prefetch_EN bit */
@@ -98,7 +98,7 @@
 		control |= 1;	/* Programmable timing on */
 	if (drive->media == ide_disk)
 		control |= 4;	/* Prefetch, post write */
-	if (pio > 2)
+	if (ide_pio_need_iordy(drive, pio))
 		control |= 2;	/* IORDY */
 	if (is_slave) {
 		master_data |=  0x4000;
@@ -32,7 +32,6 @@
  *  smarter code in libata.
  *
  * TODO:
- * - IORDY fixes
  * - VDMA support
  */
  
@@ -234,8 +233,7 @@
  *	@pio: PIO mode number
  *
  *	Load the timing settings for this device mode into the
- *	controller. If we are in PIO mode 3 or 4 turn on IORDY
- *	monitoring (bit 9). The TF timing is bits 31:16
+ *	controller.
  */
  
 static void sil_set_pio_mode(ide_drive_t *drive, u8 pio)
  
@@ -276,13 +274,16 @@
 	/* now set up IORDY */
 	speedp = sil_ioread16(dev, tfaddr - 2);
 	speedp &= ~0x200;
-	if (pio > 2)
-		speedp |= 0x200;
-	sil_iowrite16(dev, speedp, tfaddr - 2);
  
 	mode = sil_ioread8(dev, base + addr_mask);
 	mode &= ~(unit ? 0x30 : 0x03);
-	mode |= unit ? 0x10 : 0x01;
+
+	if (ide_pio_need_iordy(drive, pio)) {
+		speedp |= 0x200;
+		mode |= unit ? 0x10 : 0x01;
+	}
+
+	sil_iowrite16(dev, speedp, tfaddr - 2);
 	sil_iowrite8(dev, mode, base + addr_mask);
 }
  
@@ -61,8 +61,7 @@
 	if (cmd_off == 0)
 		cmd_off = 1;
  
-	if ((pio > 2 || ata_id_has_iordy(drive->id)) &&
-	    !(pio > 4 && ata_id_is_cfa(drive->id)))
+	if (ide_pio_need_iordy(drive, pio))
 		iordy = 0x40;
  
 	return (cmd_on - 1) << 8 | (cmd_off - 1) | iordy;
@@ -44,7 +44,7 @@
 		control |= 1;	/* Programmable timing on */
 	if (drive->media == ide_disk)
 		control |= 4;	/* Prefetch, post write */
-	if (pio > 2)
+	if (ide_pio_need_iordy(drive, pio))
 		control |= 2;	/* IORDY */
 	if (is_slave) {
 		master_data |=  0x4000;
@@ -1514,6 +1514,7 @@
 int ide_scan_pio_blacklist(char *);
 const char *ide_xfer_verbose(u8);
 u8 ide_get_best_pio_mode(ide_drive_t *, u8, u8);
+int ide_pio_need_iordy(ide_drive_t *, const u8);
 int ide_set_pio_mode(ide_drive_t *, u8);
 int ide_set_dma_mode(ide_drive_t *, u8);
 void ide_set_pio(ide_drive_t *, u8);
...	...	@@ -185,8 +185,7 @@
185	185	timing = ide_timing_find_mode(XFER_PIO_0 + pio);
186	186	BUG_ON(!timing);
187	187
188		- if ((pio > 2 \|\| ata_id_has_iordy(drive->id)) &&
189		- !(ata_id_is_cfa(drive->id) && pio > 4))
	188	+ if (ide_pio_need_iordy(drive, pio))
190	189	use_iordy = 1;
191	190
192	191	apply_timings(chipselect, pio, timing, use_iordy);
...	...	@@ -107,6 +107,12 @@
107	107	}
108	108	EXPORT_SYMBOL_GPL(ide_get_best_pio_mode);
109	109
	110	+int ide_pio_need_iordy(ide_drive_t *drive, const u8 pio)
	111	+{
	112	+ return ata_id_pio_need_iordy(drive->id, pio);
	113	+}
	114	+EXPORT_SYMBOL_GPL(ide_pio_need_iordy);
	115	+
110	116	int ide_set_pio_mode(ide_drive_t *drive, const u8 mode)
111	117	{
112	118	ide_hwif_t *hwif = drive->hwif;
...	...	@@ -66,7 +66,7 @@
66	66	if (drive->media == ide_disk)
67	67	/* enable prefetch */
68	68	drive_enables \|= 0x0004 << (drive->dn * 4);
69		- if (ata_id_has_iordy(drive->id))
	69	+ if (ide_pio_need_iordy(drive, pio))
70	70	/* enable IORDY sample-point */
71	71	drive_enables \|= 0x0002 << (drive->dn * 4);
72	72
...	...	@@ -50,7 +50,7 @@
50	50	control \|= 1; /* Programmable timing on */
51	51	if (drive->media != ide_disk)
52	52	control \|= 4; /* ATAPI */
53		- if (pio > 2)
	53	+ if (ide_pio_need_iordy(drive, pio))
54	54	control \|= 2; /* IORDY */
55	55	if (is_slave) {
56	56	master_data \|= 0x4000;
...	...	@@ -73,7 +73,7 @@
73	73	* Prefetch_EN / IORDY_EN / PA[3:0] bits of register A
74	74	*/
75	75	AP &= ~0x3f;
76		- if (ata_id_iordy_disable(drive->id))
	76	+ if (ide_pio_need_iordy(drive, speed - XFER_PIO_0))
77	77	AP \|= 0x20; /* set IORDY_EN bit */
78	78	if (drive->media == ide_disk)
79	79	AP \|= 0x10; /* set Prefetch_EN bit */
...	...	@@ -98,7 +98,7 @@
98	98	control \|= 1; /* Programmable timing on */
99	99	if (drive->media == ide_disk)
100	100	control \|= 4; /* Prefetch, post write */
101		- if (pio > 2)
	101	+ if (ide_pio_need_iordy(drive, pio))
102	102	control \|= 2; /* IORDY */
103	103	if (is_slave) {
104	104	master_data \|= 0x4000;
...	...	@@ -32,7 +32,6 @@
32	32	* smarter code in libata.
33	33	*
34	34	* TODO:
35		- * - IORDY fixes
36	35	* - VDMA support
37	36	*/
38	37
...	...	@@ -234,8 +233,7 @@
234	233	* @pio: PIO mode number
235	234	*
236	235	* Load the timing settings for this device mode into the
237		- * controller. If we are in PIO mode 3 or 4 turn on IORDY
238		- * monitoring (bit 9). The TF timing is bits 31:16
	236	+ * controller.
239	237	*/
240	238
241	239	static void sil_set_pio_mode(ide_drive_t *drive, u8 pio)
242	240
...	...	@@ -276,13 +274,16 @@
276	274	/* now set up IORDY */
277	275	speedp = sil_ioread16(dev, tfaddr - 2);
278	276	speedp &= ~0x200;
279		- if (pio > 2)
280		- speedp \|= 0x200;
281		- sil_iowrite16(dev, speedp, tfaddr - 2);
282	277
283	278	mode = sil_ioread8(dev, base + addr_mask);
284	279	mode &= ~(unit ? 0x30 : 0x03);
285		- mode \|= unit ? 0x10 : 0x01;
	280	+
	281	+ if (ide_pio_need_iordy(drive, pio)) {
	282	+ speedp \|= 0x200;
	283	+ mode \|= unit ? 0x10 : 0x01;
	284	+ }
	285	+
	286	+ sil_iowrite16(dev, speedp, tfaddr - 2);
286	287	sil_iowrite8(dev, mode, base + addr_mask);
287	288	}
288	289
...	...	@@ -61,8 +61,7 @@
61	61	if (cmd_off == 0)
62	62	cmd_off = 1;
63	63
64		- if ((pio > 2 \|\| ata_id_has_iordy(drive->id)) &&
65		- !(pio > 4 && ata_id_is_cfa(drive->id)))
	64	+ if (ide_pio_need_iordy(drive, pio))
66	65	iordy = 0x40;
67	66
68	67	return (cmd_on - 1) << 8 \| (cmd_off - 1) \| iordy;
...	...	@@ -44,7 +44,7 @@
44	44	control \|= 1; /* Programmable timing on */
45	45	if (drive->media == ide_disk)
46	46	control \|= 4; /* Prefetch, post write */
47		- if (pio > 2)
	47	+ if (ide_pio_need_iordy(drive, pio))
48	48	control \|= 2; /* IORDY */
49	49	if (is_slave) {
50	50	master_data \|= 0x4000;
...	...	@@ -1514,6 +1514,7 @@
1514	1514	int ide_scan_pio_blacklist(char *);
1515	1515	const char *ide_xfer_verbose(u8);
1516	1516	u8 ide_get_best_pio_mode(ide_drive_t *, u8, u8);
	1517	+int ide_pio_need_iordy(ide_drive_t *, const u8);
1517	1518	int ide_set_pio_mode(ide_drive_t *, u8);
1518	1519	int ide_set_dma_mode(ide_drive_t *, u8);
1519	1520	void ide_set_pio(ide_drive_t *, u8);