USB: uas: add full support for RESPONSE IU
Some devices send response IUs when you'd expect a sense IU. As a response to a wrong LUN that is within spec. We cannot get away without handling for response IUs. This version fixes the issues Hans raised. Signed-off-by: Oliver Neukum <oneukum@suse.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
f6281af9d6
commit
aa742683bb
|
@ -246,6 +246,29 @@ static void uas_xfer_data(struct urb *urb, struct scsi_cmnd *cmnd,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool uas_evaluate_response_iu(struct response_iu *riu, struct scsi_cmnd *cmnd)
|
||||||
|
{
|
||||||
|
u8 response_code = riu->response_code;
|
||||||
|
|
||||||
|
switch (response_code) {
|
||||||
|
case RC_INCORRECT_LUN:
|
||||||
|
cmnd->result = DID_BAD_TARGET << 16;
|
||||||
|
break;
|
||||||
|
case RC_TMF_SUCCEEDED:
|
||||||
|
cmnd->result = DID_OK << 16;
|
||||||
|
break;
|
||||||
|
case RC_TMF_NOT_SUPPORTED:
|
||||||
|
cmnd->result = DID_TARGET_FAILURE << 16;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
uas_log_cmd_state(cmnd, "response iu", response_code);
|
||||||
|
cmnd->result = DID_ERROR << 16;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return response_code == RC_TMF_SUCCEEDED;
|
||||||
|
}
|
||||||
|
|
||||||
static void uas_stat_cmplt(struct urb *urb)
|
static void uas_stat_cmplt(struct urb *urb)
|
||||||
{
|
{
|
||||||
struct iu *iu = urb->transfer_buffer;
|
struct iu *iu = urb->transfer_buffer;
|
||||||
|
@ -258,6 +281,7 @@ static void uas_stat_cmplt(struct urb *urb)
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
unsigned int idx;
|
unsigned int idx;
|
||||||
int status = urb->status;
|
int status = urb->status;
|
||||||
|
bool success;
|
||||||
|
|
||||||
spin_lock_irqsave(&devinfo->lock, flags);
|
spin_lock_irqsave(&devinfo->lock, flags);
|
||||||
|
|
||||||
|
@ -313,13 +337,13 @@ static void uas_stat_cmplt(struct urb *urb)
|
||||||
uas_xfer_data(urb, cmnd, SUBMIT_DATA_OUT_URB);
|
uas_xfer_data(urb, cmnd, SUBMIT_DATA_OUT_URB);
|
||||||
break;
|
break;
|
||||||
case IU_ID_RESPONSE:
|
case IU_ID_RESPONSE:
|
||||||
uas_log_cmd_state(cmnd, "unexpected response iu",
|
|
||||||
((struct response_iu *)iu)->response_code);
|
|
||||||
/* Error, cancel data transfers */
|
|
||||||
data_in_urb = usb_get_urb(cmdinfo->data_in_urb);
|
|
||||||
data_out_urb = usb_get_urb(cmdinfo->data_out_urb);
|
|
||||||
cmdinfo->state &= ~COMMAND_INFLIGHT;
|
cmdinfo->state &= ~COMMAND_INFLIGHT;
|
||||||
cmnd->result = DID_ERROR << 16;
|
success = uas_evaluate_response_iu((struct response_iu *)iu, cmnd);
|
||||||
|
if (!success) {
|
||||||
|
/* Error, cancel data transfers */
|
||||||
|
data_in_urb = usb_get_urb(cmdinfo->data_in_urb);
|
||||||
|
data_out_urb = usb_get_urb(cmdinfo->data_out_urb);
|
||||||
|
}
|
||||||
uas_try_complete(cmnd, __func__);
|
uas_try_complete(cmnd, __func__);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue