mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
ide-scsi: do non-atomic pc->flags testing
...also, convert ide-scsi to using the generic pc->flags defines. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
eaec3e7ded
commit
e3bfae4c10
1 changed files with 16 additions and 21 deletions
|
@ -60,14 +60,6 @@
|
|||
|
||||
#define IDESCSI_DEBUG_LOG 0
|
||||
|
||||
/*
|
||||
* Packet command status bits.
|
||||
*/
|
||||
#define PC_DMA_IN_PROGRESS 0 /* 1 while DMA in progress */
|
||||
#define PC_WRITING 1 /* Data direction */
|
||||
#define PC_TIMEDOUT 3 /* command timed out */
|
||||
#define PC_DMA_OK 4 /* Use DMA */
|
||||
|
||||
/*
|
||||
* SCSI command transformation layer
|
||||
*/
|
||||
|
@ -319,8 +311,10 @@ static int idescsi_end_request (ide_drive_t *drive, int uptodate, int nrsecs)
|
|||
pc = opc;
|
||||
rq = pc->rq;
|
||||
pc->scsi_cmd->result = (CHECK_CONDITION << 1) |
|
||||
((test_bit(PC_TIMEDOUT, &pc->flags)?DID_TIME_OUT:DID_OK) << 16);
|
||||
} else if (test_bit(PC_TIMEDOUT, &pc->flags)) {
|
||||
(((pc->flags & PC_FLAG_TIMEDOUT) ?
|
||||
DID_TIME_OUT :
|
||||
DID_OK) << 16);
|
||||
} else if (pc->flags & PC_FLAG_TIMEDOUT) {
|
||||
if (log)
|
||||
printk (KERN_WARNING "ide-scsi: %s: timed out for %lu\n",
|
||||
drive->name, pc->scsi_cmd->serial_number);
|
||||
|
@ -362,7 +356,7 @@ static int idescsi_expiry(ide_drive_t *drive)
|
|||
#if IDESCSI_DEBUG_LOG
|
||||
printk(KERN_WARNING "idescsi_expiry called for %lu at %lu\n", pc->scsi_cmd->serial_number, jiffies);
|
||||
#endif
|
||||
set_bit(PC_TIMEDOUT, &pc->flags);
|
||||
pc->flags |= PC_FLAG_TIMEDOUT;
|
||||
|
||||
return 0; /* we do not want the ide subsystem to retry */
|
||||
}
|
||||
|
@ -384,7 +378,7 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
|
|||
printk (KERN_INFO "ide-scsi: Reached idescsi_pc_intr interrupt handler\n");
|
||||
#endif /* IDESCSI_DEBUG_LOG */
|
||||
|
||||
if (test_bit(PC_TIMEDOUT, &pc->flags)){
|
||||
if (pc->flags & PC_FLAG_TIMEDOUT) {
|
||||
#if IDESCSI_DEBUG_LOG
|
||||
printk(KERN_WARNING "idescsi_pc_intr: got timed out packet %lu at %lu\n",
|
||||
pc->scsi_cmd->serial_number, jiffies);
|
||||
|
@ -393,7 +387,8 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
|
|||
idescsi_end_request (drive, 1, 0);
|
||||
return ide_stopped;
|
||||
}
|
||||
if (test_and_clear_bit (PC_DMA_IN_PROGRESS, &pc->flags)) {
|
||||
if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) {
|
||||
pc->flags &= ~PC_FLAG_DMA_IN_PROGRESS;
|
||||
#if IDESCSI_DEBUG_LOG
|
||||
printk ("ide-scsi: %s: DMA complete\n", drive->name);
|
||||
#endif /* IDESCSI_DEBUG_LOG */
|
||||
|
@ -432,7 +427,7 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
|
|||
"- discarding data\n");
|
||||
temp = pc->buf_size - pc->xferred;
|
||||
if (temp) {
|
||||
clear_bit(PC_WRITING, &pc->flags);
|
||||
pc->flags &= ~PC_FLAG_WRITING;
|
||||
if (pc->sg)
|
||||
idescsi_input_buffers(drive, pc,
|
||||
temp);
|
||||
|
@ -454,14 +449,14 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
|
|||
}
|
||||
}
|
||||
if (ireason & IO) {
|
||||
clear_bit(PC_WRITING, &pc->flags);
|
||||
pc->flags &= ~PC_FLAG_WRITING;
|
||||
if (pc->sg)
|
||||
idescsi_input_buffers(drive, pc, bcount);
|
||||
else
|
||||
hwif->atapi_input_bytes(drive, pc->cur_pos,
|
||||
bcount);
|
||||
} else {
|
||||
set_bit(PC_WRITING, &pc->flags);
|
||||
pc->flags |= PC_FLAG_WRITING;
|
||||
if (pc->sg)
|
||||
idescsi_output_buffers(drive, pc, bcount);
|
||||
else
|
||||
|
@ -501,8 +496,8 @@ static ide_startstop_t idescsi_transfer_pc(ide_drive_t *drive)
|
|||
ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc), idescsi_expiry);
|
||||
/* Send the actual packet */
|
||||
drive->hwif->atapi_output_bytes(drive, scsi->pc->c, 12);
|
||||
if (test_bit (PC_DMA_OK, &pc->flags)) {
|
||||
set_bit (PC_DMA_IN_PROGRESS, &pc->flags);
|
||||
if (pc->flags & PC_FLAG_DMA_OK) {
|
||||
pc->flags |= PC_FLAG_DMA_IN_PROGRESS;
|
||||
hwif->dma_start(drive);
|
||||
}
|
||||
return ide_started;
|
||||
|
@ -512,10 +507,10 @@ static inline int idescsi_set_direction(struct ide_atapi_pc *pc)
|
|||
{
|
||||
switch (pc->c[0]) {
|
||||
case READ_6: case READ_10: case READ_12:
|
||||
clear_bit(PC_WRITING, &pc->flags);
|
||||
pc->flags &= ~PC_FLAG_WRITING;
|
||||
return 0;
|
||||
case WRITE_6: case WRITE_10: case WRITE_12:
|
||||
set_bit(PC_WRITING, &pc->flags);
|
||||
pc->flags |= PC_FLAG_WRITING;
|
||||
return 0;
|
||||
default:
|
||||
return 1;
|
||||
|
@ -572,7 +567,7 @@ static ide_startstop_t idescsi_issue_pc(ide_drive_t *drive,
|
|||
ide_pktcmd_tf_load(drive, IDE_TFLAG_NO_SELECT_MASK, bcount, dma);
|
||||
|
||||
if (dma)
|
||||
set_bit(PC_DMA_OK, &pc->flags);
|
||||
pc->flags |= PC_FLAG_DMA_OK;
|
||||
|
||||
if (test_bit(IDESCSI_DRQ_INTERRUPT, &scsi->flags)) {
|
||||
ide_execute_command(drive, WIN_PACKETCMD, &idescsi_transfer_pc,
|
||||
|
|
Loading…
Reference in a new issue