[PATCH take 2] [USB] Use normalized sense when emulating autosense

Post by Daniel J Blueman
Hi Luben, Greg, Matthew,
Any plan for reviewing and accepting this patch [1] yet? I'm still
seeing the symptoms on USB 3 SATA bridges with linux-3.0+.

I needed an ack from Matthew before I could take it.

Matthew?

Post by Daniel J Blueman
--- [1]
http://www.kerneltrap.com/mailarchive/linux-kernel/2010/11/11/4644097/thread
1) Enables autosense emulation code to correctly
interpret descriptor format sense data, and
2) Fixes a bug whereby the autosense emulation
code would overwrite descriptor format sense data
with SENSE KEY HARDWARE ERROR in fixed format, to
Recovered Error [current] [descriptor]
Oct 21 14:11:07 localhost kernel: Descriptor sense data with sense
Oct 21 14:11:07 localhost kernel: 72 01 04 1d 00 00 00 0e 09 0c
00 00 00 00 00 00
Oct 21 14:11:07 localhost kernel: 00 4f 00 c2 00 50
Oct 21 14:11:07 localhost kernel: sd 7:0:0:0: [sdc] ASC=0x4 ASCQ=0x1d
---
drivers/usb/storage/transport.c | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index 64ec073..cb04664 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -691,6 +691,9 @@ void usb_stor_invoke_transport(struct scsi_cmnd
*srb, struct us_data *us)
int temp_result;
struct scsi_eh_save ses;
int sense_size = US_SENSE_SIZE;
+ struct scsi_sense_hdr sshdr;
+ const u8 *scdd;
+ u8 fm_ili;
/* device supports and needs bigger sense buffer */
if (us->fflags & US_FL_SANE_SENSE)
srb->sense_buffer[7] = (US_SENSE_SIZE - 8);
}
+ scsi_normalize_sense(srb->sense_buffer, SCSI_SENSE_BUFFERSIZE,
+ &sshdr);
+
US_DEBUGP("-- Result from auto-sense is %d\n", temp_result);
US_DEBUGP("-- code: 0x%x, key: 0x%x, ASC: 0x%x, ASCQ: 0x%x\n",
- srb->sense_buffer[0],
- srb->sense_buffer[2] & 0xf,
- srb->sense_buffer[12],
- srb->sense_buffer[13]);
+ sshdr.response_code, sshdr.sense_key,
+ sshdr.asc, sshdr.ascq);
#ifdef CONFIG_USB_STORAGE_DEBUG
- usb_stor_show_sense(
- srb->sense_buffer[2] & 0xf,
- srb->sense_buffer[12],
- srb->sense_buffer[13]);
+ usb_stor_show_sense(sshdr.sense_key, sshdr.asc, sshdr.ascq);
#endif
/* set the result so the higher layers expect this data */
srb->result = SAM_STAT_CHECK_CONDITION;
+ scdd = scsi_sense_desc_find(srb->sense_buffer,
+ SCSI_SENSE_BUFFERSIZE, 4);
+ fm_ili = (scdd ? scdd[3] : srb->sense_buffer[2]) & 0xA0;
+
/* We often get empty sense data. This could indicate that
* everything worked or that there was an unspecified
* problem. We have to decide which.
*/
- if ( /* Filemark 0, ignore EOM, ILI 0, no sense */
- (srb->sense_buffer[2] & 0xaf) == 0 &&
- /* No ASC or ASCQ */
- srb->sense_buffer[12] == 0 &&
- srb->sense_buffer[13] == 0) {
-
+ if (sshdr.sense_key == 0 && sshdr.asc == 0 && sshdr.ascq == 0 &&
+ fm_ili == 0) {
/* If things are really okay, then let's show that.
* Zero out the sense buffer so the higher layers
* won't realize we did an unsolicited auto-sense.
*/
} else {
srb->result = DID_ERROR << 16;
- srb->sense_buffer[2] = HARDWARE_ERROR;
+ if ((sshdr.response_code & 0x72) == 0x72)
+ srb->sense_buffer[1] = HARDWARE_ERROR;
+ else
+ srb->sense_buffer[2] = HARDWARE_ERROR;
}
}
}
--
Daniel J Blueman

Luben Tuikov

2011-09-02 19:08:44 UTC

Post by Daniel J Blueman
Hi Luben, Greg, Matthew,
Any plan for reviewing and accepting this patch [1] yet? I'm still
seeing the symptoms on USB 3 SATA bridges with linux-3.0+.

I needed an ack from Matthew before I could take it.
Matthew?

He acked it already: http://marc.info/?l=linux-kernel&m=128950140420081&w=2

But interestingly enough, it never made it into your tree.

Greg KH

2011-09-02 19:22:50 UTC

Post by Daniel J Blueman
Hi Luben, Greg, Matthew,
Any plan for reviewing and accepting this patch [1] yet? I'm still
seeing the symptoms on USB 3 SATA bridges with linux-3.0+.

I needed an ack from Matthew before I could take it.
Matthew?

He acked it already: http://marc.info/?l=linux-kernel&m=128950140420081&w=2
But interestingly enough, it never made it into your tree.

Odd, you did, and I found the resend I asked for in my archives, but I
don't see it in the tree, I don't know what happened here, sorry.

I'll go queue it up when master.kernel.org comes back up, sorry about
that.

greg k-h

Luben Tuikov

2011-09-02 21:28:50 UTC

Post by Daniel J Blueman
Hi Luben, Greg, Matthew,
Any plan for reviewing and accepting this patch [1] yet? I'm still
seeing the symptoms on USB 3 SATA bridges with linux-3.0+.

I needed an ack from Matthew before I could take it.
Matthew?

He acked it already: http://marc.info/?l=linux-kernel&m=128950140420081&w=2
But interestingly enough, it never made it into your tree.

Odd, you did, and I found the resend I asked for in my archives, but I
don't see it in the tree, I don't know what happened here, sorry.
I'll go queue it up when master.kernel.org comes back up, sorry about
that.

Are you sure it's mine. I don't remember resending it other than the "take 2" thread (link above).

Luben

Greg KH

2011-09-02 21:41:19 UTC