icside_dmaintr() in icside.c
Hi Russell,
* for() loop in icside_dmaintr seems buggy
* what do you think about following patch? (ide-dma is nowadays always build if BLK_DEV_IDEDMA)
[ide] icside: use ide_dma_intr()
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
drivers/ide/arm/icside.c +1 -30
@@ -392,35 +392,6 @@enable_dma (hwif->hw.dma); } -/* -* dma_intr() is the handler for disk read/write DMA interrupts -*/ -static ide_startstop_t icside_dmaintr (ide_drive_t *drive) -{ -unsigned int stat; -int dma_stat; - - dma_stat =icside_dma_end (drive); - stat =HWIF (drive)->INB (IDE_STATUS_REG ); -if (OK_STAT (stat,DRIVE_READY , drive->bad_wstat |DRQ_STAT )) { -if (!dma_stat) { -struct request *rq =HWGROUP (drive)->rq; -int i; - -for (i = rq->nr_sectors; i >0 ; ) { - i -= rq->current_nr_sectors; -DRIVER (drive)->end_request (drive,1 , rq->nr_sectors); - } - -return ide_stopped; - } -printk (KERN_ERR "%s: bad DMA status (dma_stat=%x)\n" , - drive->name, dma_stat); - } - -return DRIVER (drive)->error (drive, __FUNCTION__, stat); -} -static int icside_dma_setup (ide_drive_t *drive) {ide_hwif_t *hwif =HWIF (drive);
@@ -469,7 +440,7 @@static void icside_dma_exec_cmd (ide_drive_t *drive,u8 command) {/* issue cmd to drive */ -ide_execute_command (drive, cmd, icside_dmaintr,2 *WAIT_CMD ,NULL ); +ide_execute_command (drive, cmd, ide_dma_intr,2 *WAIT_CMD ,NULL ); }static int icside_dma_test_irq (ide_drive_t *drive)
drivers/ide/ide-dma.c +1 -1
@@ -162,7 +162,6 @@return 0 ; } -#ifdef CONFIG_BLK_DEV_IDEDMA_PCI /** * ide_dma_intr - IDE DMA interrupt handler * @drive: the drive the interrupt is for
@@ -192,6 +191,7 @@EXPORT_SYMBOL_GPL (ide_dma_intr); +#ifdef CONFIG_BLK_DEV_IDEDMA_PCI /** * ide_build_sglist - map IDE scatter gather for DMA I/O * @drive: the drive to build the DMA table for
include/linux/ide.h +1 -1
@@ -1493,12 +1493,12 @@int __ide_dma_good_drive (ide_drive_t *);int __ide_dma_off (ide_drive_t *);void ide_dma_verbose (ide_drive_t *); +ide_startstop_t ide_dma_intr (ide_drive_t *);#ifdef CONFIG_BLK_DEV_IDEDMA_PCI extern int ide_build_sglist (ide_drive_t *,struct request *);extern int ide_build_dmatable (ide_drive_t *,struct request *);extern void ide_destroy_dmatable (ide_drive_t *); -extern ide_startstop_t ide_dma_intr (ide_drive_t *);extern int ide_release_dma (ide_hwif_t *);extern void ide_setup_dma (ide_hwif_t *,unsigned long ,unsigned int );
Quoted 10 lines · Bartlomiej Zolnierkiewicz
Hi Russell,
*
for()loop inicside_dmaintrseems buggy* what do you think about following patch? (ide-dma is nowadays always build if
BLK_DEV_IDEDMA)[ide] icside: use
ide_dma_intr()Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
Looks fine. I'd have liked to have done it this way initially, but I seem to remember there were objections to using ide_dma_intr at the time ("it's for PCI only").
Please push upstream if not already done so.
Signature · 4 lines
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core