ide: add ide_set{_max}_pio() (take 4)
* Add IDE_HFLAG_ABUSE_{PREFETCH,FAST_DEVSEL,DMA_MODES} flags and set them in ht6560, cmd640, cmd64x and sc1200 host drivers. * Add set_pio_mode_abuse() for checking if host driver has a non-standard ->tuneproc() implementation and use it in do_special(). * Add ide_set_pio() for setting PIO mode (it uses hwif->pio_mask to find the maximum PIO mode supported by the host), also add ide_set_max_pio() wrapper for ide_set_pio() to use for auto-tuning. Convert users of ->tuneproc to use ide_set{_max}_pio() where possible. This leaves only do_special(), set_using_pio(), ide_hwif_restore() and ide_set_pio() as a direct users of ->tuneproc. * Remove no longer needed ide_get_best_pio_mode() calls and printk-s reporting PIO mode selected from ->tuneproc implementations. * Rename ->tuneproc hook to ->set_pio_mode and make 'pio' argument const. * Remove stale comment from ide_config_drive_speed(). v2: * Fix "ata_" prefix (Noticed by Jeff). v3: * Minor cleanups/fixups per Sergei's suggestions. v4: * Fix compile problem in drivers/ide/pci/cmd640.c (Noticed by Andrew Morton). * Improve some ->set_pio_mode comments. Reviewed-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
@@ -147,16 +147,16 @@ static int cs5535_set_drive(ide_drive_t *drive, u8 speed)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/****
|
||||
* cs5535_tuneproc - PIO setup
|
||||
* @drive: drive to set up
|
||||
* @pio: mode to use (255 for 'best possible')
|
||||
/**
|
||||
* cs5535_set_pio_mode - PIO setup
|
||||
* @drive: drive
|
||||
* @pio: PIO mode number
|
||||
*
|
||||
* A callback from the upper layers for PIO-only tuning.
|
||||
*/
|
||||
static void cs5535_tuneproc(ide_drive_t *drive, u8 pio)
|
||||
|
||||
static void cs5535_set_pio_mode(ide_drive_t *drive, const u8 pio)
|
||||
{
|
||||
pio = ide_get_best_pio_mode(drive, pio, 4);
|
||||
ide_config_drive_speed(drive, XFER_PIO_0 + pio);
|
||||
cs5535_set_speed(drive, XFER_PIO_0 + pio);
|
||||
}
|
||||
@@ -169,7 +169,7 @@ static int cs5535_dma_check(ide_drive_t *drive)
|
||||
return 0;
|
||||
|
||||
if (ide_use_fast_pio(drive))
|
||||
cs5535_tuneproc(drive, 255);
|
||||
ide_set_max_pio(drive);
|
||||
|
||||
return -1;
|
||||
}
|
||||
@@ -198,7 +198,7 @@ static void __devinit init_hwif_cs5535(ide_hwif_t *hwif)
|
||||
|
||||
hwif->autodma = 0;
|
||||
|
||||
hwif->tuneproc = &cs5535_tuneproc;
|
||||
hwif->set_pio_mode = &cs5535_set_pio_mode;
|
||||
hwif->speedproc = &cs5535_set_drive;
|
||||
hwif->ide_dma_check = &cs5535_dma_check;
|
||||
|
||||
|
Reference in New Issue
Block a user