ide-pmac: remove control register messing from pmac_ide_dma_check()
PATCH 4/11 ide-pmac: remove control register messing from pmac_ide_dma_check()
pmac_ide_do_setfeature() contains matching nIEN setting/clearing so this Device Control register messing in pmac_ide_dma_check() is totally unnecessary.
--- drivers/ide/ppc/pmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ide/ppc/pmac.c +1 -1
@@ -1784,7 +1784,7 @@ pmac_ide_dma_check(ide_drive_t *drive) drive->using_dma =pmac_ide_udma_enable (drive, mode); else if (mode >= XFER_MW_DMA_0) drive->using_dma = pmac_ide_mdma_enable(drive, mode); - hwif->OUTB (0 ,IDE_CONTROL_REG ); +/* Apply settings to controller */ pmac_ide_do_update_timings (drive); }
Quoted 5 lines · Bartlomiej Zolnierkiewicz
pmac_ide_do_setfeature()contains matching nIEN setting/clearing so this Device Control register messing inpmac_ide_dma_check()is totally unnecessary.Cc Benjamin Herrenschmidt <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
NAK for now. There was a reason for that, I need to remember, but I think I have a weirdo case with the media-bay removable CD drive on wallstreet that locks up the bus if you don't do something along the sequence in there.
I have one of those machines in the office, so I should be able to give it a go today to check, in the meantime, keep that patch on hold.
Ben.
Quoted 16 lines
drivers/ide/ppc/pmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Index:
b/drivers/ide/ppc/pmac.c
===================================================================drivers/ide/ppc/pmac.c +1
-1@@ -1784,7 +1784,7 @@ pmac_ide_dma_check(ide_drive_t *drive) drive->using_dma =pmac_ide_udma_enable (drive, mode); else if (mode >= XFER_MW_DMA_0) drive->using_dma = pmac_ide_mdma_enable(drive, mode); - hwif->OUTB (0 ,IDE_CONTROL_REG ); +/* Apply settings to controller */ pmac_ide_do_update_timings (drive); }