Commit 55f17e8d authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 26bcb879

drivers/ide/pci/amd74xx.c

+4 −11
Original line number Diff line number Diff line 
/*

 * Version 2.21

 * Version 2.22

 *

 * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04

 * IDE driver for Linux.
@@ -276,17 +276,10 @@ 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 (ide_tune_dma(drive))

		return 0;



	if (speed == 0) {

	ide_set_max_pio(drive);

		return -1;

	}



	amd_set_drive(drive, speed);



	if (drive->autodma)

		return 0;



	return -1;

}

drivers/ide/pci/via82cxxx.c

+4 −11
Original line number Diff line number Diff line 
/*

 *

 * Version 3.47

 * Version 3.48

 *

 * VIA IDE driver for Linux. Supported southbridges:

 *
@@ -217,17 +217,10 @@ 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 (ide_tune_dma(drive))

		return 0;



	if (speed == 0) {

	ide_set_max_pio(drive);

		return -1;

	}



	via_set_drive(drive, speed);



	if (drive->autodma)

		return 0;



	return -1;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE