aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/cris
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-02-16 20:40:25 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-02-16 20:40:25 -0500
commit7569e8dc2213ecc47024ea5edbadc8736487d926 (patch)
tree44c47e85b5e87c75972c077da31f198c4f597688 /drivers/ide/cris
parent056a697b7388844a1341e92e277bff8e5bf61ec9 (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/cris')
-rw-r--r--drivers/ide/cris/ide-cris.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index 5797e0b5a132..7afb715b86e5 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -821,6 +821,9 @@ init_e100_ide (void)
821 hwif->ultra_mask = cris_ultra_mask; 821 hwif->ultra_mask = cris_ultra_mask;
822 hwif->mwdma_mask = 0x07; /* Multiword DMA 0-2 */ 822 hwif->mwdma_mask = 0x07; /* Multiword DMA 0-2 */
823 hwif->swdma_mask = 0x07; /* Singleword DMA 0-2 */ 823 hwif->swdma_mask = 0x07; /* Singleword DMA 0-2 */
824 hwif->autodma = 1;
825 hwif->drives[0].autodma = 1;
826 hwif->drives[1].autodma = 1;
824 } 827 }
825 828
826 /* Reset pulse */ 829 /* Reset pulse */
@@ -1046,14 +1049,9 @@ static ide_startstop_t cris_dma_intr (ide_drive_t *drive)
1046static int cris_dma_check(ide_drive_t *drive) 1049static int cris_dma_check(ide_drive_t *drive)
1047{ 1050{
1048 ide_hwif_t *hwif = drive->hwif; 1051 ide_hwif_t *hwif = drive->hwif;
1049 struct hd_driveid* id = drive->id;
1050 1052
1051 if (id && (id->capability & 1)) { 1053 if (ide_use_dma(drive) && cris_config_drive_for_dma(drive))
1052 if (ide_use_dma(drive)) { 1054 return hwif->ide_dma_on(drive);
1053 if (cris_config_drive_for_dma(drive))
1054 return hwif->ide_dma_on(drive);
1055 }
1056 }
1057 1055
1058 return hwif->ide_dma_off_quietly(drive); 1056 return hwif->ide_dma_off_quietly(drive);
1059} 1057}