Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9ef59ff authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 6dae44f9

drivers/ide/at91_ide.c

+1 −2
Original line number Diff line number Diff line
@@ -185,8 +185,7 @@ static void at91_ide_set_pio_mode(ide_drive_t *drive, const u8 pio) 
	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);

drivers/ide/ide-xfer-mode.c

+6 −0
Original line number Diff line number Diff line
@@ -107,6 +107,12 @@ u8 ide_get_best_pio_mode(ide_drive_t *drive, u8 mode_wanted, u8 max_mode) 
}

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;

drivers/ide/it8172.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static void it8172_set_pio_mode(ide_drive_t *drive, const u8 pio) 
	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);

drivers/ide/it8213.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void it8213_set_pio_mode(ide_drive_t *drive, const u8 pio) 
		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;

drivers/ide/pdc202xx_old.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static void pdc202xx_set_mode(ide_drive_t *drive, const u8 speed) 
		 * 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 */