diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-11 17:54:00 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-11 17:54:00 -0400 |
commit | 26bcb879c03254545a19c6700fe5bcef6f21e7b1 (patch) | |
tree | dc35f1a7d7860fe0de268ff92189ff0884b689d3 /drivers/ide/pci/siimage.c | |
parent | 842c19ad6fc0dbd9ac9d2f8527466201802934cf (diff) |
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>
Diffstat (limited to 'drivers/ide/pci/siimage.c')
-rw-r--r-- | drivers/ide/pci/siimage.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index 4c1f3bc7e179..e07c991d91b9 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
@@ -219,9 +219,8 @@ static void sil_tune_pio(ide_drive_t *drive, u8 pio) | |||
219 | } | 219 | } |
220 | } | 220 | } |
221 | 221 | ||
222 | static void sil_tuneproc(ide_drive_t *drive, u8 pio) | 222 | static void sil_set_pio_mode(ide_drive_t *drive, const u8 pio) |
223 | { | 223 | { |
224 | pio = ide_get_best_pio_mode(drive, pio, 4); | ||
225 | sil_tune_pio(drive, pio); | 224 | sil_tune_pio(drive, pio); |
226 | (void)ide_config_drive_speed(drive, XFER_PIO_0 + pio); | 225 | (void)ide_config_drive_speed(drive, XFER_PIO_0 + pio); |
227 | } | 226 | } |
@@ -328,7 +327,7 @@ static int siimage_config_drive_for_dma (ide_drive_t *drive) | |||
328 | return 0; | 327 | return 0; |
329 | 328 | ||
330 | if (ide_use_fast_pio(drive)) | 329 | if (ide_use_fast_pio(drive)) |
331 | sil_tuneproc(drive, 255); | 330 | ide_set_max_pio(drive); |
332 | 331 | ||
333 | return -1; | 332 | return -1; |
334 | } | 333 | } |
@@ -899,7 +898,7 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif) | |||
899 | 898 | ||
900 | hwif->resetproc = &siimage_reset; | 899 | hwif->resetproc = &siimage_reset; |
901 | hwif->speedproc = &siimage_tune_chipset; | 900 | hwif->speedproc = &siimage_tune_chipset; |
902 | hwif->tuneproc = &sil_tuneproc; | 901 | hwif->set_pio_mode = &sil_set_pio_mode; |
903 | hwif->reset_poll = &siimage_reset_poll; | 902 | hwif->reset_poll = &siimage_reset_poll; |
904 | hwif->pre_reset = &siimage_pre_reset; | 903 | hwif->pre_reset = &siimage_pre_reset; |
905 | hwif->udma_filter = &sil_udma_filter; | 904 | hwif->udma_filter = &sil_udma_filter; |