diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:25 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:25 -0500 |
commit | 7569e8dc2213ecc47024ea5edbadc8736487d926 (patch) | |
tree | 44c47e85b5e87c75972c077da31f198c4f597688 /drivers/ide/ppc/scc_pata.c | |
parent | 056a697b7388844a1341e92e277bff8e5bf61ec9 (diff) |
ide: add ide_use_fast_pio() helper (v3)
* add ide_use_fast_pio() helper for use by host drivers
* add DMA capability and hwif->autodma checks to ide_use_dma()
- au1xxx-ide/it8213/it821x drivers didn't check for (id->capability & 1)
[ for the IT8211/2 in SMART mode this check shouldn't be made but since
in it821x_fixups() we set DMA bit explicitly:
if(strstr(id->model, "Integrated Technology Express")) {
/* In raid mode the ident block is slightly buggy
We need to set the bits so that the IDE layer knows
LBA28. LBA48 and DMA ar valid */
id->capability |= 3; /* LBA28, DMA */
we are better off using generic helper if we can ]
- ide-cris driver didn't set ->autodma
[ before the patch hwif->autodma was only checked in the chipset specific
hwif->ide_dma_check implementations, for ide-cris it is cris_dma_check()
function so there no behavior change here ]
v2:
* updated patch description (thanks to Alan Cox for the feedback)
v3:
* updated for scc_pata driver
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ppc/scc_pata.c')
-rw-r--r-- | drivers/ide/ppc/scc_pata.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/ide/ppc/scc_pata.c b/drivers/ide/ppc/scc_pata.c index 65ad8ab34598..0ab26ea5a35a 100644 --- a/drivers/ide/ppc/scc_pata.c +++ b/drivers/ide/ppc/scc_pata.c | |||
@@ -383,16 +383,11 @@ static int scc_config_chipset_for_dma(ide_drive_t *drive) | |||
383 | static int scc_config_drive_for_dma(ide_drive_t *drive) | 383 | static int scc_config_drive_for_dma(ide_drive_t *drive) |
384 | { | 384 | { |
385 | ide_hwif_t *hwif = HWIF(drive); | 385 | ide_hwif_t *hwif = HWIF(drive); |
386 | struct hd_driveid *id = drive->id; | ||
387 | 386 | ||
388 | if ((id->capability & 1) != 0 && drive->autodma) { | 387 | if (ide_use_dma(drive) && scc_config_chipset_for_dma(drive)) |
389 | if (ide_use_dma(drive)) { | 388 | return hwif->ide_dma_on(drive); |
390 | if (scc_config_chipset_for_dma(drive)) | 389 | |
391 | return hwif->ide_dma_on(drive); | 390 | if (ide_use_fast_pio(drive)) { |
392 | } | ||
393 | goto fast_ata_pio; | ||
394 | } else if ((id->capability & 8) || (id->field_valid & 2)) { | ||
395 | fast_ata_pio: | ||
396 | hwif->tuneproc(drive, 4); | 391 | hwif->tuneproc(drive, 4); |
397 | hwif->ide_dma_off_quietly(drive); | 392 | hwif->ide_dma_off_quietly(drive); |
398 | } | 393 | } |