diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-08-14 12:51:00 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-17 13:34:37 -0400 |
commit | abbca103a02ff0e87569c38be518f9cb2d6baabc (patch) | |
tree | c22b0cffd7cd35e1f6760562dd584826b2c437f0 /drivers | |
parent | 4fc383c09d14783ca7d7e97e2134abbe7dc43230 (diff) |
ieee1394: sbp2: better handling of transport errors
If the target signals a transport failure via status block, complete the
request with DID_BUSY to indicate to the SCSI subsystem that the command
may succeed when retried.
Also log diagnostic information if the status block shows a transport
related problem. It may point to hardware faults.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ieee1394/sbp2.c | 16 | ||||
-rw-r--r-- | drivers/ieee1394/sbp2.h | 6 |
2 files changed, 14 insertions, 8 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 5440cd050268..6b3350f71a89 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
@@ -2213,28 +2213,34 @@ static int sbp2_handle_status_write(struct hpsb_host *host, int nodeid, | |||
2213 | spin_unlock_irqrestore(&scsi_id->sbp2_command_orb_lock, flags); | 2213 | spin_unlock_irqrestore(&scsi_id->sbp2_command_orb_lock, flags); |
2214 | 2214 | ||
2215 | if (SCpnt) { | 2215 | if (SCpnt) { |
2216 | if (STATUS_TEST_RS(sb->ORB_offset_hi_misc)) | 2216 | u32 h = sb->ORB_offset_hi_misc; |
2217 | u32 r = STATUS_GET_RESP(h); | ||
2218 | |||
2219 | if (r != RESP_STATUS_REQUEST_COMPLETE) { | ||
2220 | SBP2_WARN("resp 0x%x, sbp_status 0x%x", | ||
2221 | r, STATUS_GET_SBP_STATUS(h)); | ||
2217 | scsi_status = | 2222 | scsi_status = |
2223 | r == RESP_STATUS_TRANSPORT_FAILURE ? | ||
2224 | SBP2_SCSI_STATUS_BUSY : | ||
2218 | SBP2_SCSI_STATUS_COMMAND_TERMINATED; | 2225 | SBP2_SCSI_STATUS_COMMAND_TERMINATED; |
2226 | } | ||
2219 | /* | 2227 | /* |
2220 | * See if the target stored any scsi status information. | 2228 | * See if the target stored any scsi status information. |
2221 | */ | 2229 | */ |
2222 | if (STATUS_GET_LEN(sb->ORB_offset_hi_misc) > 1) { | 2230 | if (STATUS_GET_LEN(h) > 1) { |
2223 | SBP2_DEBUG("CHECK CONDITION"); | 2231 | SBP2_DEBUG("CHECK CONDITION"); |
2224 | scsi_status = sbp2_status_to_sense_data( | 2232 | scsi_status = sbp2_status_to_sense_data( |
2225 | (unchar *)sb, SCpnt->sense_buffer); | 2233 | (unchar *)sb, SCpnt->sense_buffer); |
2226 | } | 2234 | } |
2227 | |||
2228 | /* | 2235 | /* |
2229 | * Check to see if the dead bit is set. If so, we'll | 2236 | * Check to see if the dead bit is set. If so, we'll |
2230 | * have to initiate a fetch agent reset. | 2237 | * have to initiate a fetch agent reset. |
2231 | */ | 2238 | */ |
2232 | if (STATUS_TEST_D(sb->ORB_offset_hi_misc)) { | 2239 | if (STATUS_TEST_DEAD(h)) { |
2233 | SBP2_DEBUG("Dead bit set - " | 2240 | SBP2_DEBUG("Dead bit set - " |
2234 | "initiating fetch agent reset"); | 2241 | "initiating fetch agent reset"); |
2235 | sbp2_agent_reset(scsi_id, 0); | 2242 | sbp2_agent_reset(scsi_id, 0); |
2236 | } | 2243 | } |
2237 | |||
2238 | SBP2_ORB_DEBUG("completing command orb %p", &command->command_orb); | 2244 | SBP2_ORB_DEBUG("completing command orb %p", &command->command_orb); |
2239 | } | 2245 | } |
2240 | 2246 | ||
diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h index 1c9fe422cf4c..34c52bf4fa34 100644 --- a/drivers/ieee1394/sbp2.h +++ b/drivers/ieee1394/sbp2.h | |||
@@ -181,11 +181,11 @@ struct sbp2_unrestricted_page_table { | |||
181 | #define SBP2_SCSI_STATUS_SELECTION_TIMEOUT 0xff | 181 | #define SBP2_SCSI_STATUS_SELECTION_TIMEOUT 0xff |
182 | 182 | ||
183 | #define STATUS_GET_SRC(value) (((value) >> 30) & 0x3) | 183 | #define STATUS_GET_SRC(value) (((value) >> 30) & 0x3) |
184 | #define STATUS_GET_RESP(value) (((value) >> 28) & 0x3) | ||
184 | #define STATUS_GET_LEN(value) (((value) >> 24) & 0x7) | 185 | #define STATUS_GET_LEN(value) (((value) >> 24) & 0x7) |
186 | #define STATUS_GET_SBP_STATUS(value) (((value) >> 16) & 0xff) | ||
185 | #define STATUS_GET_ORB_OFFSET_HI(value) ((value) & 0x0000ffff) | 187 | #define STATUS_GET_ORB_OFFSET_HI(value) ((value) & 0x0000ffff) |
186 | #define STATUS_TEST_D(value) ((value) & 0x08000000) | 188 | #define STATUS_TEST_DEAD(value) ((value) & 0x08000000) |
187 | /* test 'resp' | 'sbp2_status' */ | ||
188 | #define STATUS_TEST_RS(value) ((value) & 0x30ff0000) | ||
189 | /* test 'resp' | 'dead' | 'sbp2_status' */ | 189 | /* test 'resp' | 'dead' | 'sbp2_status' */ |
190 | #define STATUS_TEST_RDS(value) ((value) & 0x38ff0000) | 190 | #define STATUS_TEST_RDS(value) ((value) & 0x38ff0000) |
191 | 191 | ||