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

Commit 89613e66 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: don't set PIO mode on pre-EIDE drives 



Fix handling of the PIO modes for the pre-EIDE drives that did not support
the PIO Flow Control Transfer Mode value (00001 nnn) of the Set Transfer Mode
feature by skipping the actual mode programming.

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent a1d85864

drivers/ide/ide-iops.c

+6 −1
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ int ide_driveid_update(ide_drive_t *drive) 
int ide_config_drive_speed(ide_drive_t *drive, u8 speed)

{

	ide_hwif_t *hwif = drive->hwif;

	int error;

	int error = 0;

	u8 stat;



//	while (HWGROUP(drive)->busy)
@@ -767,6 +767,10 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed) 
		hwif->dma_host_off(drive);

#endif



	/* Skip setting PIO flow-control modes on pre-EIDE drives */

	if ((speed & 0xf8) == XFER_PIO_0 && !(drive->id->capability & 0x08))

		goto skip;



	/*

	 * Don't use ide_wait_cmd here - it will

	 * attempt to set_geometry and recalibrate,
@@ -814,6 +818,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed) 
	drive->id->dma_mword &= ~0x0F00;

	drive->id->dma_1word &= ~0x0F00;



 skip:

#ifdef CONFIG_BLK_DEV_IDEDMA

	if (speed >= XFER_SW_DMA_0)

		hwif->dma_host_on(drive);