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

Commit 8e714a07 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by David S. Miller
Browse files

ide-timings: use ->pio_mode value to determine fastest PIO speed 



Use the current PIO mode value instead of the physical maximum one
to determine the fastest allowed PIO for shared PIO/DMA timings.

Affected host drivers: amd74xx and via82cxxx.

[ Update comment to match -DaveM ]

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8776168c

drivers/ide/ide-timings.c

+2 −3
Original line number Diff line number Diff line
@@ -186,11 +186,10 @@ int ide_timing_compute(ide_drive_t *drive, u8 speed, 
	/*

	 * Even in DMA/UDMA modes we still use PIO access for IDENTIFY,

	 * S.M.A.R.T and some other commands. We have to ensure that the

	 * DMA cycle timing is slower/equal than the fastest PIO timing.

	 * DMA cycle timing is slower/equal than the current PIO timing.

	 */

	if (speed >= XFER_SW_DMA_0) {

		u8 pio = ide_get_best_pio_mode(drive, 255, 5);

		ide_timing_compute(drive, XFER_PIO_0 + pio, &p, T, UT);

		ide_timing_compute(drive, drive->pio_mode, &p, T, UT);

		ide_timing_merge(&p, t, t, IDE_TIMING_ALL);

	}