Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / drivers / usb / storage / uas.c

diff --git a/kernel/drivers/usb/storage/uas.c b/kernel/drivers/usb/storage/uas.c
index 6d3122a..e26e321 100644 (file)
--- a/kernel/drivers/usb/storage/uas.c
+++ b/kernel/drivers/usb/storage/uas.c
@@ -2,7 +2,7 @@
  * USB Attached SCSI
  * Note that this is not the same as the USB Mass Storage driver
  *
- * Copyright Hans de Goede <hdegoede@redhat.com> for Red Hat, Inc. 2013 - 2014
+ * Copyright Hans de Goede <hdegoede@redhat.com> for Red Hat, Inc. 2013 - 2016
  * Copyright Matthew Wilcox for Intel Corp, 2010
  * Copyright Sarah Sharp for Intel Corp, 2010
  *
@@ -257,17 +257,16 @@ static void uas_stat_cmplt(struct urb *urb)
        struct uas_cmd_info *cmdinfo;
        unsigned long flags;
        unsigned int idx;
+       int status = urb->status;
 
        spin_lock_irqsave(&devinfo->lock, flags);
 
        if (devinfo->resetting)
                goto out;
 
-       if (urb->status) {
-               if (urb->status != -ENOENT && urb->status != -ECONNRESET) {
-                       dev_err(&urb->dev->dev, "stat urb: status %d\n",
-                               urb->status);
-               }
+       if (status) {
+               if (status != -ENOENT && status != -ECONNRESET && status != -ESHUTDOWN)
+                       dev_err(&urb->dev->dev, "stat urb: status %d\n", status);
                goto out;
        }
 
@@ -348,6 +347,7 @@ static void uas_data_cmplt(struct urb *urb)
        struct uas_dev_info *devinfo = (void *)cmnd->device->hostdata;
        struct scsi_data_buffer *sdb = NULL;
        unsigned long flags;
+       int status = urb->status;
 
        spin_lock_irqsave(&devinfo->lock, flags);
 
@@ -374,9 +374,9 @@ static void uas_data_cmplt(struct urb *urb)
                goto out;
        }
 
-       if (urb->status) {
-               if (urb->status != -ENOENT && urb->status != -ECONNRESET)
-                       uas_log_cmd_state(cmnd, "data cmplt err", urb->status);
+       if (status) {
+               if (status != -ENOENT && status != -ECONNRESET && status != -ESHUTDOWN)
+                       uas_log_cmd_state(cmnd, "data cmplt err", status);
                /* error: no data transfered */
                sdb->resid = sdb->length;
        } else {
@@ -757,6 +757,17 @@ static int uas_eh_bus_reset_handler(struct scsi_cmnd *cmnd)
        return SUCCESS;
 }
 
+static int uas_target_alloc(struct scsi_target *starget)
+{
+       struct uas_dev_info *devinfo = (struct uas_dev_info *)
+                       dev_to_shost(starget->dev.parent)->hostdata;
+
+       if (devinfo->flags & US_FL_NO_REPORT_LUNS)
+               starget->no_report_luns = 1;
+
+       return 0;
+}
+
 static int uas_slave_alloc(struct scsi_device *sdev)
 {
        struct uas_dev_info *devinfo =
@@ -796,6 +807,10 @@ static int uas_slave_configure(struct scsi_device *sdev)
        if (devinfo->flags & US_FL_NO_REPORT_OPCODES)
                sdev->no_report_opcodes = 1;
 
+       /* A few buggy USB-ATA bridges don't understand FUA */
+       if (devinfo->flags & US_FL_BROKEN_FUA)
+               sdev->broken_fua = 1;
+
        scsi_change_queue_depth(sdev, devinfo->qdepth - 2);
        return 0;
 }
@@ -804,16 +819,15 @@ static struct scsi_host_template uas_host_template = {
        .module = THIS_MODULE,
        .name = "uas",
        .queuecommand = uas_queuecommand,
+       .target_alloc = uas_target_alloc,
        .slave_alloc = uas_slave_alloc,
        .slave_configure = uas_slave_configure,
        .eh_abort_handler = uas_eh_abort_handler,
        .eh_bus_reset_handler = uas_eh_bus_reset_handler,
-       .can_queue = 65536,     /* Is there a limit on the _host_ ? */
+       .can_queue = MAX_CMNDS,
        .this_id = -1,
        .sg_tablesize = SG_NONE,
-       .cmd_per_lun = 1,       /* until we override it */
        .skip_settle_delay = 1,
-       .use_blk_tags = 1,
 };
 
 #define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \
@@ -930,9 +944,11 @@ static int uas_probe(struct usb_interface *intf, const struct usb_device_id *id)
        if (result)
                goto set_alt0;
 
-       result = scsi_init_shared_tag_map(shost, devinfo->qdepth - 2);
-       if (result)
-               goto free_streams;
+       /*
+        * 1 tag is reserved for untagged commands +
+        * 1 tag to avoid off by one errors in some bridge firmwares
+        */
+       shost->can_queue = devinfo->qdepth - 2;
 
        usb_set_intfdata(intf, shost);
        result = scsi_add_host(shost, &intf->dev);