Re: [PATCH 03/10] ide-atapi: teach ide atapi about drive->waiting_for_dma

Bartlomiej Zolnierkiewicz
2008-09-15T18:33:24Z

On Sunday 14 September 2008 13:35:51 Borislav Petkov wrote:
> This is in preparation for converting ide-cd to generic code. The actual
> rewiring will be done later after the issue_pc/transfer_pc code knows all about
> ide-cd.
>
> There should be no functional change resulting from this patch.
>
> Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
> ---
> drivers/ide/ide-atapi.c | 16 +++++++++++++---
> 1 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
> index d557841..763acd7 100644
> --- a/drivers/ide/ide-atapi.c
> +++ b/drivers/ide/ide-atapi.c
> @@ -487,7 +487,13 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
> ide_startstop_t startstop;
> u8 ireason;
>
> - if (ide_wait_stat(&startstop, drive, ATA_DRQ, ATA_BUSY, WAIT_READY)) {
> + if ((drive->media == ide_cdrom || drive->media == ide_optical) &&
> + (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT)) {
> + if (drive->dma)
> + drive->waiting_for_dma = 1;
> + }

We really want to do this for all ATAPI devices (as a bugfix).

> + else if (ide_wait_stat(&startstop, drive, ATA_DRQ, ATA_BUSY,
> + WAIT_READY)) {

IIRC similar check was removed from ide-cd so maybe this one
is also unnecessary?

> printk(KERN_ERR "%s: Strange, packet command initiated yet "
> "DRQ isn't asserted\n", drive->name);
> return startstop;
> @@ -562,8 +568,10 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout,
> ide_dma_off(drive);
> }
>
> - if ((pc->flags & PC_FLAG_DMA_OK) &&
> - (drive->dev_flags & IDE_DFLAG_USING_DMA)) {
> + if (((pc->flags & PC_FLAG_DMA_OK) &&
> + (drive->dev_flags & IDE_DFLAG_USING_DMA)) ||
> + ((drive->media == ide_cdrom || drive->media == ide_optical) &&
> + drive->dma)) {

drive->dma is only set by ide-cd so no need to check for media type,
also I think that it better fits in some later patch.

> if (scsi)
> hwif->sg_mapped = 1;
> drive->dma = !hwif->dma_ops->dma_setup(drive);
> @@ -579,6 +587,8 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout,
>
> /* Issue the packet command */
> if (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) {
> + if (drive->dma)
> + drive->waiting_for_dma = 0;
> ide_execute_command(drive, ATA_CMD_PACKET, ide_transfer_pc,
> timeout, NULL);
> return ide_started;

Please recast the patch to have only ->waiting_for_dma change. Thanks.