Skip to content

Commit

Permalink
[PATCH] libata: implement ATA_FLAG_IN_EH port flag
Browse files Browse the repository at this point in the history
ATA_FLAG_IN_EH flag is set on entry to EH and cleared on completion.
This patch just sets and clears the flag.  Following patches will
build normal qc execution / EH synchronization aroung this flag.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed Feb 9, 2006
1 parent 725b280 commit dde4458
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
9 changes: 9 additions & 0 deletions drivers/scsi/libata-scsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -735,13 +735,22 @@ int ata_scsi_error(struct Scsi_Host *host)

DPRINTK("ENTER\n");

spin_lock_irqsave(&ap->host_set->lock, flags);
assert(!(ap->flags & ATA_FLAG_IN_EH));
ap->flags |= ATA_FLAG_IN_EH;
spin_unlock_irqrestore(&ap->host_set->lock, flags);

ap = (struct ata_port *) &host->hostdata[0];
ap->ops->eng_timeout(ap);

assert(host->host_failed == 0 && list_empty(&host->eh_cmd_q));

scsi_eh_flush_done_q(&ap->eh_done_q);

spin_lock_irqsave(&ap->host_set->lock, flags);
ap->flags &= ~ATA_FLAG_IN_EH;
spin_unlock_irqrestore(&ap->host_set->lock, flags);

DPRINTK("EXIT\n");
return 0;
}
Expand Down
2 changes: 2 additions & 0 deletions include/linux/libata.h
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ enum {
ATA_FLAG_PIO_LBA48 = (1 << 13), /* Host DMA engine is LBA28 only */
ATA_FLAG_IRQ_MASK = (1 << 14), /* Mask IRQ in PIO xfers */

ATA_FLAG_IN_EH = (1 << 15), /* EH in progress */

ATA_QCFLAG_ACTIVE = (1 << 1), /* cmd not yet ack'd to scsi lyer */
ATA_QCFLAG_SG = (1 << 3), /* have s/g table? */
ATA_QCFLAG_SINGLE = (1 << 4), /* no s/g, just a single buffer */
Expand Down

0 comments on commit dde4458

Please sign in to comment.