[PATCH 4/11] 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()

[Bartlomiej Zolnierkiewicz]

pmac_ide_do_setfeature() contains matching nIEN setting/clearing so this
Device Control register messing in pmac_ide_dma_check() is totally unnecessary.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/ppc/pmac.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: b/drivers/ide/ppc/pmac.c
===================================================================
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -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);
 	}

Re: [PATCH 4/11] ide-pmac: remove control register messing from pmac_ide_dma_check()

[Benjamin Herrenschmidt]

On Sun, 2007-07-22 at 20:23 +0200, Bartlomiej Zolnierkiewicz wrote:
> pmac_ide_do_setfeature() contains matching nIEN setting/clearing so this
> Device Control register messing in pmac_ide_dma_check() is totally unnecessary.
> 
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

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.


>  drivers/ide/ppc/pmac.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: b/drivers/ide/ppc/pmac.c
> ===================================================================
> --- a/drivers/ide/ppc/pmac.c
> +++ b/drivers/ide/ppc/pmac.c
> @@ -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);
>  	}