Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

ide: disable DMA in ->ide_dma_check for "no IORDY" case (v2)

Browse Source 
If DMA is unsupported ->ide_dma_check should disable DMA.

v2:
* updated for scc_pata

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2007-02-17 02:40:25 +01:00
parent 2ad1e558a2
commit d8f4469d5f
15 changed files with 43 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/ide/pci/aec62xx.c
View File

@ -214,12 +214,10 @@ static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);
if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
aec62xx_tune_drive(drive, 5);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;
return hwif->ide_dma_off_quietly(drive);
}
static int aec62xx_irq_timeout (ide_drive_t *drive)

5
drivers/ide/pci/atiixp.c
View File

@ -264,10 +264,9 @@ static int atiixp_dma_check(ide_drive_t *drive)
tspeed = ide_get_best_pio_mode(drive, 255, 5, NULL);
speed = atiixp_dma_2_pio(XFER_PIO_0 + tspeed) + XFER_PIO_0;
hwif->speedproc(drive, speed);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;
return hwif->ide_dma_off_quietly(drive);
}
/**

8
drivers/ide/pci/cmd64x.c
View File

@ -479,12 +479,10 @@ static int cmd64x_config_drive_for_dma (ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);
if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
config_chipset_for_pio(drive, 1);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;
return hwif->ide_dma_off_quietly(drive);
}
static int cmd64x_alt_dma_status (struct pci_dev *dev)

5
drivers/ide/pci/cs5535.c
View File

@ -206,10 +206,9 @@ static int cs5535_dma_check(ide_drive_t *drive)
if (ide_use_fast_pio(drive)) {
speed = ide_get_best_pio_mode(drive, 255, 4, NULL);
cs5535_set_drive(drive, speed);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;
return hwif->ide_dma_off_quietly(drive);
}
static u8 __devinit cs5535_cable_detect(struct pci_dev *dev)

8
drivers/ide/pci/hpt34x.c
View File

@ -120,12 +120,10 @@ static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive)
return hwif->ide_dma_on(drive);
#endif
if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
hpt34x_tune_drive(drive, 255);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;
return hwif->ide_dma_off_quietly(drive);
}
/*

8
drivers/ide/pci/hpt366.c
View File

@ -743,12 +743,10 @@ static int hpt366_config_drive_xfer_rate(ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);
if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
hpt3xx_tune_drive(drive, 255);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;
return hwif->ide_dma_off_quietly(drive);
}
/*

8
drivers/ide/pci/pdc202xx_new.c
View File

@ -288,12 +288,10 @@ static int pdcnew_config_drive_xfer_rate(ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);
if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
hwif->tuneproc(drive, 255);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;
return hwif->ide_dma_off_quietly(drive);
}
static int pdcnew_quirkproc(ide_drive_t *drive)

8
drivers/ide/pci/pdc202xx_old.c
View File

@ -329,12 +329,10 @@ static int pdc202xx_config_drive_xfer_rate (ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);
if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
pdc202xx_tune_drive(drive, 255);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;
return hwif->ide_dma_off_quietly(drive);
}
static int pdc202xx_quirkproc (ide_drive_t *drive)

8
drivers/ide/pci/piix.c
View File

@ -393,14 +393,12 @@ static int piix_config_drive_xfer_rate (ide_drive_t *drive)
if (ide_use_dma(drive) && piix_config_drive_for_dma(drive))
return hwif->ide_dma_on(drive);
if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
/* Find best PIO mode. */
(void) hwif->speedproc(drive, XFER_PIO_0 +
ide_get_best_pio_mode(drive, 255, 4, NULL));
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;
return hwif->ide_dma_off_quietly(drive);
}
/**

9
drivers/ide/pci/serverworks.c
View File

@ -322,13 +322,10 @@ static int svwks_config_drive_xfer_rate (ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);
if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
config_chipset_for_pio(drive);
// hwif->tuneproc(drive, 5);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;
return hwif->ide_dma_off_quietly(drive);
}
static unsigned int __devinit init_chipset_svwks (struct pci_dev *dev, const char *name)

8
drivers/ide/pci/siimage.c
View File

@ -419,12 +419,10 @@ static int siimage_config_drive_for_dma (ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);
if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
config_chipset_for_pio(drive, 1);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;
return hwif->ide_dma_off_quietly(drive);
}
/* returns 1 if dma irq issued, 0 otherwise */

8
drivers/ide/pci/sis5513.c
View File

@ -678,12 +678,10 @@ static int sis5513_config_xfer_rate(ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);
if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
sis5513_tune_drive(drive, 5);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;
return hwif->ide_dma_off_quietly(drive);
}
/* Chip detection and general config */

8
drivers/ide/pci/slc90e66.c
View File

@ -186,13 +186,11 @@ static int slc90e66_config_drive_xfer_rate (ide_drive_t *drive)
if (ide_use_dma(drive) && slc90e66_config_drive_for_dma(drive))
return hwif->ide_dma_on(drive);
if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
(void) hwif->speedproc(drive, XFER_PIO_0 +
ide_get_best_pio_mode(drive, 255, 4, NULL));
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;
return hwif->ide_dma_off_quietly(drive);
}
static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)

8
drivers/ide/pci/tc86c001.c
View File

@ -190,12 +190,10 @@ static int tc86c001_config_drive_xfer_rate(ide_drive_t *drive)
if (ide_use_dma(drive) && config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);
if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
tc86c001_tune_drive(drive, 255);
return hwif->ide_dma_off_quietly(drive);
}
/* IORDY not supported */
return 0;
return hwif->ide_dma_off_quietly(drive);
}
static void __devinit init_hwif_tc86c001(ide_hwif_t *hwif)

7
drivers/ide/ppc/scc_pata.c
View File

@ -376,11 +376,10 @@ static int scc_config_drive_for_dma(ide_drive_t *drive)
if (ide_use_dma(drive) && scc_config_chipset_for_dma(drive))
return hwif->ide_dma_on(drive);
if (ide_use_fast_pio(drive)) {
if (ide_use_fast_pio(drive))
hwif->tuneproc(drive, 4);
hwif->ide_dma_off_quietly(drive);
}
return 1; /* DMA is not supported */
return hwif->ide_dma_off_quietly(drive);
}
/**