Commit cbeef22f authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman

usb: uas: unconditionally bring back host after reset

Quoting Hans:

If we return 1 from our post_reset handler, then our disconnect handler
will be called immediately afterwards. Since pre_reset blocks all scsi
requests our disconnect handler will then hang in the scsi_remove_host
call.

This is esp. bad because our disconnect handler hanging for ever also
stops the USB subsys from enumerating any new USB devices, causes commands
like lsusb to hang, etc.

In practice this happens when unplugging some uas devices because the hub
code may see the device as needing a warm-reset and calls usb_reset_device
before seeing the disconnect. In this case uas_configure_endpoints fails
with -ENODEV. We do not want to print an error for this, so this commit
also silences the shost_printk for -ENODEV.

ENDQUOTE

However, if we do that we better drop any unconditional execution
and report to the SCSI subsystem that we have undergone a reset
but we are not operational now.
Signed-off-by: default avatarOliver Neukum <oneukum@suse.com>
Reported-by: default avatarHans de Goede <hdegoede@redhat.com>
CC: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f0386c08
...@@ -1076,20 +1076,19 @@ static int uas_post_reset(struct usb_interface *intf) ...@@ -1076,20 +1076,19 @@ static int uas_post_reset(struct usb_interface *intf)
return 0; return 0;
err = uas_configure_endpoints(devinfo); err = uas_configure_endpoints(devinfo);
if (err) { if (err && err != ENODEV)
shost_printk(KERN_ERR, shost, shost_printk(KERN_ERR, shost,
"%s: alloc streams error %d after reset", "%s: alloc streams error %d after reset",
__func__, err); __func__, err);
return 1;
}
/* we must unblock the host in every case lest we deadlock */
spin_lock_irqsave(shost->host_lock, flags); spin_lock_irqsave(shost->host_lock, flags);
scsi_report_bus_reset(shost, 0); scsi_report_bus_reset(shost, 0);
spin_unlock_irqrestore(shost->host_lock, flags); spin_unlock_irqrestore(shost->host_lock, flags);
scsi_unblock_requests(shost); scsi_unblock_requests(shost);
return 0; return err ? 1 : 0;
} }
static int uas_suspend(struct usb_interface *intf, pm_message_t message) static int uas_suspend(struct usb_interface *intf, pm_message_t message)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment