Hi Bart, On Sun, Dec 21, 2008 at 08:05:56PM +0100, Bartlomiej Zolnierkiewicz wrote: [.. ] > > don't do cdrom_decode_status for DRQ_INTERRUPT devices but this is > > probably not that relevant anymore since we busy-wait for DRQ to get set > > through ide_wait_stat, as we talked about it before - it being a bugfix for > > all atapi devices. If there's still interest for that (and I think it > > Yes, this change is OK but for bisectability reasons it would be better > to do it in pre-patch (which would fix ide-cd.c accordingly). > > [ The other changes in functionality are small and acceptable for this > patch (i.e. ide_wait_stat() prints error message now) except the change > of the ordering between ->dma_start and ->output_data calls -- which > also seems to deserve patch on its own. ] sorry for the delay but you know how it is, Christmas and all. Anyway, here are the patches attached as you requested, just in time for the merge window. -- From: Borislav Petkov <petkovbb@xxxxxxxxx> Date: Thu, 25 Dec 2008 18:12:34 +0100 Subject: [PATCH 09/11] ide-cd: wait for DRQ to get set per default ... instead of assuming it is set for accelerated DRQ type devices. Signed-off-by: Borislav Petkov <petkovbb@xxxxxxxxx> --- drivers/ide/ide-cd.c | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 6c7dd8f..1c1ba43 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -572,24 +572,17 @@ static ide_startstop_t cdrom_transfer_packet_command(ide_drive_t *drive) ide_debug_log(IDE_DBG_PC, "Call %s\n", __func__); - if (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) { - /* - * Here we should have been called after receiving an interrupt - * from the device. DRQ should how be set. - */ - - /* check for errors */ - if (cdrom_decode_status(drive, ATA_DRQ, NULL)) - return ide_stopped; + /* we must wait for DRQ to get set */ + if (ide_wait_stat(&startstop, drive, ATA_DRQ, ATA_BUSY, WAIT_READY)) { + printk(KERN_ERR "%s: timeout while waiting for DRQ to assert\n", + drive->name); + return startstop; + } + if (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) { /* ok, next interrupt will be DMA interrupt */ if (drive->dma) drive->waiting_for_dma = 1; - } else { - /* otherwise, we must wait for DRQ to get set */ - if (ide_wait_stat(&startstop, drive, ATA_DRQ, - ATA_BUSY, WAIT_READY)) - return startstop; } /* arm the interrupt handler */ -- 1.6.0.4 -- Regards/Gruss, Boris. -- 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