提交 55f17e8d 编写于 作者: B Bartlomiej Zolnierkiewicz

amd74xx/via82cxxx: use ide_tune_dma()

* Use ide_tune_dma() in amd74xx/via82cxxx driver, this fixes following bugs:
  - DMA capability bit not being checked on the device
  - DMA blacklist not being checked
  - DMA mode being programmed even if drive->autodma == 0
    (thus possibly destroying PIO timings)

* Bump driver version.
Acked-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
上级 26bcb879
/* /*
* Version 2.21 * Version 2.22
* *
* AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04 * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04
* IDE driver for Linux. * IDE driver for Linux.
...@@ -276,18 +276,11 @@ static void amd_set_pio_mode(ide_drive_t *drive, const u8 pio) ...@@ -276,18 +276,11 @@ static void amd_set_pio_mode(ide_drive_t *drive, const u8 pio)
static int amd74xx_ide_dma_check(ide_drive_t *drive) static int amd74xx_ide_dma_check(ide_drive_t *drive)
{ {
u8 speed = ide_max_dma_mode(drive); if (ide_tune_dma(drive))
if (speed == 0) {
ide_set_max_pio(drive);
return -1;
}
amd_set_drive(drive, speed);
if (drive->autodma)
return 0; return 0;
ide_set_max_pio(drive);
return -1; return -1;
} }
......
/* /*
* *
* Version 3.47 * Version 3.48
* *
* VIA IDE driver for Linux. Supported southbridges: * VIA IDE driver for Linux. Supported southbridges:
* *
...@@ -217,18 +217,11 @@ static void via_set_pio_mode(ide_drive_t *drive, const u8 pio) ...@@ -217,18 +217,11 @@ static void via_set_pio_mode(ide_drive_t *drive, const u8 pio)
static int via82cxxx_ide_dma_check (ide_drive_t *drive) static int via82cxxx_ide_dma_check (ide_drive_t *drive)
{ {
u8 speed = ide_max_dma_mode(drive); if (ide_tune_dma(drive))
if (speed == 0) {
ide_set_max_pio(drive);
return -1;
}
via_set_drive(drive, speed);
if (drive->autodma)
return 0; return 0;
ide_set_max_pio(drive);
return -1; return -1;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册