diff options
author | Boaz Harrosh <bharrosh@panasas.com> | 2007-07-29 15:22:04 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-08-04 10:12:48 -0400 |
commit | 0ceb47987d31f8529c60f1e802e0523fcde9492c (patch) | |
tree | 475bcd2d6bfa14a659a3b4612261fc8f9773d0b4 | |
parent | b1ee0795276f976118f832313488e6daf83ff542 (diff) |
[SCSI] aha152x: preliminary fixes and some comments
hunk by hunk:
- CHECK_CONDITION is what happens to cmnd->status >> 1
or after status_byte() macro. But here it is used
directly on status which means 0x1 which is an undefined
bit in the standard. And is a status that will never
return from a target.
- in busfree_run at the DONE_SC phase we have 3 distinct
operation:
1-if(DONE_SC->SCp.phase & check_condition)
The REQUEST_SENSE command return.
- Restore original command
- Than continue to operation 3.
2-if(DONE_SC->SCp.Status==SAM_STAT_CHECK_CONDITION)
A regular command returned with a status.
- Internally re-Q a REQUEST_SENSE.
- Do not do operation 3.
3-
- Complete the command and return it to scsi-ml
So the 0x2 in both these operations (1,2) means the scsi
check-condition status, hence SAM_STAT_CHECK_CONDITION
- Here the code asks about !(DONE_SC->SCp.Status & not_issued)
but "not_issued" is an enum belonging to the "phase" member
and not to the Status returned from target. The reason this
works is because not_issued==1 and Also CHECK_CONDITION==1
(remember from hunk 1). So actually the code was asking
!(DONE_SC->SCp.Status & CHECK_CONDITION). Which means
"Has the status been read from target yet?"
Staus is read at status_run(). "not_issued" is
cleared in seldo_run() which is usually earlier than
status_run().
So this patch does nothing as far as assembly is concerned
but it does let the reader understand what is going on.
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r-- | drivers/scsi/aha152x.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c index c841f11f4e32..dc7d84bae96b 100644 --- a/drivers/scsi/aha152x.c +++ b/drivers/scsi/aha152x.c | |||
@@ -986,7 +986,7 @@ static int aha152x_internal_queue(Scsi_Cmnd *SCpnt, struct completion *complete, | |||
986 | SCpnt->scsi_done = done; | 986 | SCpnt->scsi_done = done; |
987 | SCpnt->resid = SCpnt->request_bufflen; | 987 | SCpnt->resid = SCpnt->request_bufflen; |
988 | SCpnt->SCp.phase = not_issued | phase; | 988 | SCpnt->SCp.phase = not_issued | phase; |
989 | SCpnt->SCp.Status = CHECK_CONDITION; | 989 | SCpnt->SCp.Status = 0x1; /* Ilegal status by SCSI standard */ |
990 | SCpnt->SCp.Message = 0; | 990 | SCpnt->SCp.Message = 0; |
991 | SCpnt->SCp.have_data_in = 0; | 991 | SCpnt->SCp.have_data_in = 0; |
992 | SCpnt->SCp.sent_command = 0; | 992 | SCpnt->SCp.sent_command = 0; |
@@ -1574,12 +1574,12 @@ static void busfree_run(struct Scsi_Host *shpnt) | |||
1574 | cmd->use_sg = sc->use_sg; | 1574 | cmd->use_sg = sc->use_sg; |
1575 | cmd->cmd_len = sc->cmd_len; | 1575 | cmd->cmd_len = sc->cmd_len; |
1576 | 1576 | ||
1577 | cmd->SCp.Status = 0x02; | 1577 | cmd->SCp.Status = SAM_STAT_CHECK_CONDITION; |
1578 | 1578 | ||
1579 | HOSTDATA(shpnt)->commands--; | 1579 | HOSTDATA(shpnt)->commands--; |
1580 | if (!HOSTDATA(shpnt)->commands) | 1580 | if (!HOSTDATA(shpnt)->commands) |
1581 | SETPORT(PORTA, 0); /* turn led off */ | 1581 | SETPORT(PORTA, 0); /* turn led off */ |
1582 | } else if(DONE_SC->SCp.Status==0x02) { | 1582 | } else if(DONE_SC->SCp.Status==SAM_STAT_CHECK_CONDITION) { |
1583 | #if defined(AHA152X_STAT) | 1583 | #if defined(AHA152X_STAT) |
1584 | HOSTDATA(shpnt)->busfree_with_check_condition++; | 1584 | HOSTDATA(shpnt)->busfree_with_check_condition++; |
1585 | #endif | 1585 | #endif |
@@ -1587,7 +1587,7 @@ static void busfree_run(struct Scsi_Host *shpnt) | |||
1587 | DPRINTK(debug_eh, ERR_LEAD "CHECK CONDITION found\n", CMDINFO(DONE_SC)); | 1587 | DPRINTK(debug_eh, ERR_LEAD "CHECK CONDITION found\n", CMDINFO(DONE_SC)); |
1588 | #endif | 1588 | #endif |
1589 | 1589 | ||
1590 | if(!(DONE_SC->SCp.Status & not_issued)) { | 1590 | if(!(DONE_SC->SCp.phase & not_issued)) { |
1591 | Scsi_Cmnd *ptr = DONE_SC; | 1591 | Scsi_Cmnd *ptr = DONE_SC; |
1592 | DONE_SC=NULL; | 1592 | DONE_SC=NULL; |
1593 | #if 0 | 1593 | #if 0 |