Hi,
Generally looks OK, thanks for working on it.
Some comments below.
Albert Lee wrote:
>
> patch 2/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 controllers.
Please make it patch 1/2 or just merge two patches together.
We should always have the kernel in the "working" state
(so introduction of the new fix first, removal of the old one next).
> Signed-off-by: Albert Lee <albertcc@xxxxxxxxxx>
> ---
>
> Calling hwif->ide_dma_clear_irq for all controllers looks risky.
> Revised to do it only for the Intel controllers.
> (If any other adapters need it, we may add it later.)
OK
> Patch against 2.6.20-rc6. Tested ok on my ICH4 and pdc20275 adapters.
> Please review/apply, thanks.
>
> diff -Nrup 01_remove_from_ide_cd/drivers/ide/ide-cd.c 02_add_to_ide_intr/drivers/ide/ide-cd.c
> --- 01_remove_from_ide_cd/drivers/ide/ide-cd.c 2007-01-29 17:23:34.000000000 +0800
> +++ 02_add_to_ide_intr/drivers/ide/ide-cd.c 2007-01-29 17:23:58.000000000 +0800
> @@ -923,6 +923,10 @@ static ide_startstop_t cdrom_start_packe
> 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;
> @@ -965,6 +969,10 @@ static ide_startstop_t cdrom_transfer_pa
> /* 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,
> diff -Nrup 01_remove_from_ide_cd/drivers/ide/ide-dma.c 02_add_to_ide_intr/drivers/ide/ide-dma.c
> --- 01_remove_from_ide_cd/drivers/ide/ide-dma.c 2006-11-30 05:57:37.000000000 +0800
> +++ 02_add_to_ide_intr/drivers/ide/ide-dma.c 2007-01-29 17:23:58.000000000 +0800
> @@ -650,6 +650,20 @@ static int __ide_dma_test_irq(ide_drive_
> drive->name, __FUNCTION__);
> return 0;
> }
> +
> +void __ide_dma_clear_irq(ide_drive_t *drive)
> +{
> + ide_hwif_t *hwif = HWIF(drive);
> + u8 dma_stat;
> +
> + /* clear the INTR & ERROR bits */
> + dma_stat = hwif->INB(hwif->dma_status);
> + /* Should we force the bit as well ? */
> + hwif->OUTB(dma_stat, hwif->dma_status);
> +}
> +
> +EXPORT_SYMBOL_GPL(__ide_dma_clear_irq);
As noted by Sergei, this belongs to piix.c
(at least for now, we can change it when needed).
> #endif /* CONFIG_BLK_DEV_IDEDMA_PCI */
>
> int __ide_dma_bad_drive (ide_drive_t *drive)
> diff -Nrup 01_remove_from_ide_cd/drivers/ide/ide-io.c 02_add_to_ide_intr/drivers/ide/ide-io.c
> --- 01_remove_from_ide_cd/drivers/ide/ide-io.c 2006-11-30 05:57:37.000000000 +0800
> +++ 02_add_to_ide_intr/drivers/ide/ide-io.c 2007-01-29 17:23:58.000000000 +0800
> @@ -1644,6 +1644,18 @@ irqreturn_t ide_intr (int irq, void *dev
> }
> hwgroup->handler = NULL;
> del_timer(&hwgroup->timer);
> +
> + /* Some controllers might set DMA INTR no matter DMA or PIO;
> + * bmdma status might need to be cleared even for
> + * PIO interrupts to prevent spurious/lost irq.
> + */
> + if (hwif->ide_dma_clear_irq && !(drive->waiting_for_dma))
> + /* ide_dma_end() needs bmdma status for error checking.
> + * So, skip clearing bmdma status here and leave it
> + * to ide_dma_end() if this is dma interrupt.
> + */
> + hwif->ide_dma_clear_irq(drive);
> +
> spin_unlock(&ide_lock);
Is there a reason to protect ->ide_dma_clear_irq call by the ide_lock?
If not please move the call outside the lock.
> if (drive->unmask)
> diff -Nrup 01_remove_from_ide_cd/drivers/ide/ide.c 02_add_to_ide_intr/drivers/ide/ide.c
> --- 01_remove_from_ide_cd/drivers/ide/ide.c 2007-01-29 17:19:48.000000000 +0800
> +++ 02_add_to_ide_intr/drivers/ide/ide.c 2007-01-29 17:23:58.000000000 +0800
> @@ -503,6 +503,7 @@ static void ide_hwif_restore(ide_hwif_t
> hwif->ide_dma_on = tmp_hwif->ide_dma_on;
> hwif->ide_dma_off_quietly = tmp_hwif->ide_dma_off_quietly;
> hwif->ide_dma_test_irq = tmp_hwif->ide_dma_test_irq;
> + hwif->ide_dma_clear_irq = tmp_hwif->ide_dma_clear_irq;
> hwif->ide_dma_host_on = tmp_hwif->ide_dma_host_on;
> hwif->ide_dma_host_off = tmp_hwif->ide_dma_host_off;
> hwif->ide_dma_lostirq = tmp_hwif->ide_dma_lostirq;
> diff -Nrup 01_remove_from_ide_cd/drivers/ide/pci/piix.c 02_add_to_ide_intr/drivers/ide/pci/piix.c
> --- 01_remove_from_ide_cd/drivers/ide/pci/piix.c 2007-01-29 17:23:34.000000000 +0800
> +++ 02_add_to_ide_intr/drivers/ide/pci/piix.c 2007-01-29 17:23:58.000000000 +0800
> @@ -483,6 +483,7 @@ static void __devinit init_hwif_piix(ide
> if (!hwif->dma_base)
> return;
>
> + hwif->ide_dma_clear_irq = &__ide_dma_clear_irq;
As noted by Alan, this should be probably done only for newer
chipsets. I think that we can safely do it for all ICHx chipsets.
It should be possible to split out ICHx PCI ID filter from
init_chipset_piix() (as this function does the tuning only on
ICHx chipsets) to some helper function and use it later in
init_hwif_piix().
With the above corrections I'll happily add the patch to my tree.
Thanks,
Bart
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
