Commit 7569e8dc authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add ide_use_fast_pio() helper (v3) 



* add ide_use_fast_pio() helper for use by host drivers

* add DMA capability and hwif->autodma checks to ide_use_dma()

  - au1xxx-ide/it8213/it821x drivers didn't check for (id->capability & 1)

    [ for the IT8211/2 in SMART mode this check shouldn't be made but since
      in it821x_fixups() we set DMA bit explicitly:

               if(strstr(id->model, "Integrated Technology Express")) {
                       /* In raid mode the ident block is slightly buggy
                          We need to set the bits so that the IDE layer knows
                          LBA28. LBA48 and DMA ar valid */
                       id->capability |= 3;            /* LBA28, DMA */

       we are better off using generic helper if we can ]

  - ide-cris driver didn't set ->autodma

    [ before the patch hwif->autodma was only checked in the chipset specific
      hwif->ide_dma_check implementations, for ide-cris it is cris_dma_check()
      function so there no behavior change here ]

v2:
* updated patch description (thanks to Alan Cox for the feedback)

v3:
* updated for scc_pata driver

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 056a697b

drivers/ide/cris/ide-cris.c

+5 −7
Original line number Diff line number Diff line
@@ -821,6 +821,9 @@ init_e100_ide (void) 
		hwif->ultra_mask = cris_ultra_mask;

		hwif->mwdma_mask = 0x07; /* Multiword DMA 0-2 */

		hwif->swdma_mask = 0x07; /* Singleword DMA 0-2 */

		hwif->autodma = 1;

		hwif->drives[0].autodma = 1;

		hwif->drives[1].autodma = 1;

	}



	/* Reset pulse */
@@ -1046,14 +1049,9 @@ static ide_startstop_t cris_dma_intr (ide_drive_t *drive) 
static int cris_dma_check(ide_drive_t *drive)

{

	ide_hwif_t *hwif = drive->hwif;

	struct hd_driveid* id = drive->id;



	if (id && (id->capability & 1)) {

		if (ide_use_dma(drive)) {

			if (cris_config_drive_for_dma(drive))

	if (ide_use_dma(drive) && cris_config_drive_for_dma(drive))

		return hwif->ide_dma_on(drive);

		}

	}



	return hwif->ide_dma_off_quietly(drive);

}

drivers/ide/ide-dma.c

+3 −0
Original line number Diff line number Diff line
@@ -680,6 +680,9 @@ int ide_use_dma(ide_drive_t *drive) 
	struct hd_driveid *id = drive->id;

	ide_hwif_t *hwif = drive->hwif;



	if ((id->capability & 1) == 0 || drive->autodma == 0)

		return 0;



	/* consult the list of known "bad" drives */

	if (__ide_dma_bad_drive(drive))

		return 0;

drivers/ide/ide-lib.c

+15 −0
Original line number Diff line number Diff line
@@ -205,6 +205,21 @@ int ide_dma_enable (ide_drive_t *drive) 


EXPORT_SYMBOL(ide_dma_enable);



int ide_use_fast_pio(ide_drive_t *drive)

{

	struct hd_driveid *id = drive->id;



	if ((id->capability & 1) && drive->autodma)

		return 1;



	if ((id->capability & 8) || (id->field_valid & 2))

		return 1;



	return 0;

}



EXPORT_SYMBOL_GPL(ide_use_fast_pio);



/*

 * Standard (generic) timings for PIO modes, from ATA2 specification.

 * These timings are for access to the IDE data port register *only*.

drivers/ide/pci/aec62xx.c

+3 −11
Original line number Diff line number Diff line
@@ -210,19 +210,11 @@ static void aec62xx_tune_drive (ide_drive_t *drive, u8 pio) 
static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive)

{

	ide_hwif_t *hwif	= HWIF(drive);

	struct hd_driveid *id	= drive->id;



	if ((id->capability & 1) && drive->autodma) {



		if (ide_use_dma(drive)) {

			if (config_chipset_for_dma(drive))

	if (ide_use_dma(drive) && config_chipset_for_dma(drive))

		return hwif->ide_dma_on(drive);

		}



		goto fast_ata_pio;



	} else if ((id->capability & 8) || (id->field_valid & 2)) {

fast_ata_pio:

	if (ide_use_fast_pio(drive)) {

		aec62xx_tune_drive(drive, 5);

		return hwif->ide_dma_off_quietly(drive);

	}

drivers/ide/pci/atiixp.c

+3 −11
Original line number Diff line number Diff line
@@ -253,22 +253,14 @@ static int atiixp_config_drive_for_dma(ide_drive_t *drive) 
static int atiixp_dma_check(ide_drive_t *drive)

{

	ide_hwif_t *hwif	= HWIF(drive);

	struct hd_driveid *id	= drive->id;

	u8 tspeed, speed;



	drive->init_speed = 0;



	if ((id->capability & 1) && drive->autodma) {



		if (ide_use_dma(drive)) {

			if (atiixp_config_drive_for_dma(drive))

	if (ide_use_dma(drive) && atiixp_config_drive_for_dma(drive))

		return hwif->ide_dma_on(drive);

		}



		goto fast_ata_pio;



	} else if ((id->capability & 8) || (id->field_valid & 2)) {

fast_ata_pio:

	if (ide_use_fast_pio(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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE