diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-25 16:17:18 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-25 16:17:18 -0500 |
commit | 4db90a145292327b95b03f6dcd3352327235cc36 (patch) | |
tree | c48ba5fc31e27d6fbdb8883151bdf237e7eb1920 /drivers/ide/pci/siimage.c | |
parent | 428c6440ef933a3d9df5adfeb2cbb3ea7ebb6a68 (diff) |
ide: add IDE_HFLAG_ABUSE_SET_DMA_MODE host flag
* Add IDE_HFLAG_ABUSE_SET_DMA_MODE host flag and use it to decide
what to do with transfer modes < XFER_PIO_0 in ide_set_xfer_rate().
* Set IDE_HFLAG_ABUSE_SET_DMA_MODE in host drivers that need it
(aec62xx, amd74xx, cs5520, cs5535, hpt34x, hpt366, pdc202xx_old,
serverworks, tc86c001 and via82cxxx) and cleanup ->set_dma_mode
methods in host drivers that don't (IDE core code guarantees that
->set_dma_mode will be called only for modes which are present
in SWDMA/MWDMA/UDMA masks).
While at it:
* Add IDE_HFLAGS_HPT34X/HPT3XX/PDC202XX/SVWKS define in
hpt34x/hpt366/pdc202xx_old/serverworks host driver.
There should be no functionality changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/siimage.c')
-rw-r--r-- | drivers/ide/pci/siimage.c | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c index 5709c252543b..7b45eaf5afd9 100644 --- a/drivers/ide/pci/siimage.c +++ b/drivers/ide/pci/siimage.c | |||
@@ -278,27 +278,14 @@ static void sil_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
278 | 278 | ||
279 | scsc = is_sata(hwif) ? 1 : scsc; | 279 | scsc = is_sata(hwif) ? 1 : scsc; |
280 | 280 | ||
281 | switch(speed) { | 281 | if (speed >= XFER_UDMA_0) { |
282 | case XFER_MW_DMA_2: | 282 | multi = dma[2]; |
283 | case XFER_MW_DMA_1: | 283 | ultra |= (scsc ? ultra6[speed - XFER_UDMA_0] : |
284 | case XFER_MW_DMA_0: | 284 | ultra5[speed - XFER_UDMA_0]); |
285 | multi = dma[speed - XFER_MW_DMA_0]; | 285 | mode |= (unit ? 0x30 : 0x03); |
286 | mode |= ((unit) ? 0x20 : 0x02); | 286 | } else { |
287 | break; | 287 | multi = dma[speed - XFER_MW_DMA_0]; |
288 | case XFER_UDMA_6: | 288 | mode |= (unit ? 0x20 : 0x02); |
289 | case XFER_UDMA_5: | ||
290 | case XFER_UDMA_4: | ||
291 | case XFER_UDMA_3: | ||
292 | case XFER_UDMA_2: | ||
293 | case XFER_UDMA_1: | ||
294 | case XFER_UDMA_0: | ||
295 | multi = dma[2]; | ||
296 | ultra |= ((scsc) ? (ultra6[speed - XFER_UDMA_0]) : | ||
297 | (ultra5[speed - XFER_UDMA_0])); | ||
298 | mode |= ((unit) ? 0x30 : 0x03); | ||
299 | break; | ||
300 | default: | ||
301 | return; | ||
302 | } | 289 | } |
303 | 290 | ||
304 | if (hwif->mmio) { | 291 | if (hwif->mmio) { |