Skip to content

Commit

Permalink
amd74xx/via82cxxx: use ide_tune_dma()
Browse files Browse the repository at this point in the history
* 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: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Oct 11, 2007
1 parent 26bcb87 commit 55f17e8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 22 deletions.
15 changes: 4 additions & 11 deletions drivers/ide/pci/amd74xx.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Version 2.21
* Version 2.22
*
* AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04
* IDE driver for Linux.
Expand Down Expand Up @@ -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)
{
u8 speed = ide_max_dma_mode(drive);

if (speed == 0) {
ide_set_max_pio(drive);
return -1;
}

amd_set_drive(drive, speed);

if (drive->autodma)
if (ide_tune_dma(drive))
return 0;

ide_set_max_pio(drive);

return -1;
}

Expand Down
15 changes: 4 additions & 11 deletions drivers/ide/pci/via82cxxx.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* Version 3.47
* Version 3.48
*
* VIA IDE driver for Linux. Supported southbridges:
*
Expand Down Expand Up @@ -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)
{
u8 speed = ide_max_dma_mode(drive);

if (speed == 0) {
ide_set_max_pio(drive);
return -1;
}

via_set_drive(drive, speed);

if (drive->autodma)
if (ide_tune_dma(drive))
return 0;

ide_set_max_pio(drive);

return -1;
}

Expand Down

0 comments on commit 55f17e8

Please sign in to comment.