Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 254bb550 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide-pmac: use ide_tune_dma() (take 2) 



* Add missing initialization of hwif->autodma and drive->autodma to
  pmac_ide_setup_dma().

* Use ide_tune_dma() in pmac_ide_dma_check().

While at it:

* Fix pmac_ide_dma_check() return value if DMA mode is not programmed
  (should be "-1" otherwise ide_set_dma() will try to enable DMA).

* Remove unnecessary drive->using_dma fiddling (->dma_off_quietly is always
  called before ide_set_dma() call and ide_set_dma() calls ->ide_dma_on if
  ->ide_dma_check returns "0").

v2:
* No reason to blacklist all ide_floppy devices and the old code was always
  enabling DMA anyway (without even programming controller/device if the
  device was ide_floppy).

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent aedea591

drivers/ide/ppc/pmac.c

+7 −18
Original line number Diff line number Diff line
@@ -1593,24 +1593,10 @@ pmac_ide_destroy_dmatable (ide_drive_t *drive) 
static int

pmac_ide_dma_check(ide_drive_t *drive)

{

	int enable = 1;



	drive->using_dma = 0;

	

	if (drive->media == ide_floppy)

		enable = 0;

	if ((drive->id->capability & 1) == 0 && !__ide_dma_good_drive(drive))

		enable = 0;

	if (__ide_dma_bad_drive(drive))

		enable = 0;



	if (enable) {

		u8 mode = ide_max_dma_mode(drive);



		if (mode && pmac_ide_tune_chipset(drive, mode) == 0)

			drive->using_dma = 1;

	}

	if (ide_tune_dma(drive))

		return 0;



	return -1;

}



/*
@@ -1845,6 +1831,9 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) 
			hwif->swdma_mask = 0x00;

			break;

	}



	hwif->autodma = 1;

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

}



#endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */