ide: clear bmdma status in ide_intr() for ICHx controllers (revised #4)

patch 1/2 (revised):
- Fix drive->waiting_for_dma to work with CDB-intr devices.
- Do the dma status clearing in ide_intr() and add a new
  hwif->ide_dma_clear_irq for Intel ICHx controllers.

Revised per Alan, Sergei and Bart's advice.

Patch against 2.6.20-rc6. Tested ok on my ICH4 and pdc20275 adapters.
Please review/apply, thanks.

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: "Adam W. Hawks" <awhawks@us.ibm.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 5969cec58dc..21f4ae2b717 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -930,6 +930,10 @@ static ide_startstop_t cdrom_start_packet_command(ide_drive_t *drive,
                 HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG);
  
         if (CDROM_CONFIG_FLAGS (drive)->drq_interrupt) {
+                /* waiting for CDB interrupt, not DMA yet. */
+                if (info->dma)
+                        drive->waiting_for_dma = 0;
+
                 /* packet command */
                 ide_execute_command(drive, WIN_PACKETCMD, handler, ATAPI_WAIT_PC, cdrom_timer_expiry);
                 return ide_started;
@@ -972,6 +976,10 @@ static ide_startstop_t cdrom_transfer_packet_command (ide_drive_t *drive,
                 /* Check for errors. */
                 if (cdrom_decode_status(drive, DRQ_STAT, NULL))
                         return ide_stopped;
+
+                /* Ok, next interrupt will be DMA interrupt. */
+                if (info->dma)
+                        drive->waiting_for_dma = 1;
         } else {
                 /* Otherwise, we must wait for DRQ to get set. */
                 if (ide_wait_stat(&startstop, drive, DRQ_STAT,