6 files changed, 46 insertions, 29 deletions

diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c
index a745f91d2928..e7705d3532c9 100644
--- a/drivers/scsi/libiscsi_tcp.c
+++ b/drivers/scsi/libiscsi_tcp.c
@@ -177,7 +177,6 @@ int iscsi_tcp_segment_done(struct iscsi_tcp_conn *tcp_conn,
                            struct iscsi_segment *segment, int recv,
                            unsigned copied)
 {
-        static unsigned char padbuf[ISCSI_PAD_LEN];
         struct scatterlist sg;
         unsigned int pad;
 
@@ -233,7 +232,7 @@ int iscsi_tcp_segment_done(struct iscsi_tcp_conn *tcp_conn,
                         debug_tcp("consume %d pad bytes\n", pad);
                         segment->total_size += pad;
                         segment->size = pad;
-                        segment->data = padbuf;
+                        segment->data = segment->padbuf;
                         return 0;
                 }
         }
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 2d4f32b4df5c..9ad4d0968e5c 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1258,35 +1258,48 @@ qla2x00_init_rings(scsi_qla_host_t *vha)
 {
         int     rval;
         unsigned long flags = 0;
-        int cnt;
+        int cnt, que;
         struct qla_hw_data *ha = vha->hw;
-        struct req_que *req = ha->req_q_map[0];
-        struct rsp_que *rsp = ha->rsp_q_map[0];
+        struct req_que *req;
+        struct rsp_que *rsp;
+        struct scsi_qla_host *vp;
         struct mid_init_cb_24xx *mid_init_cb =
             (struct mid_init_cb_24xx *) ha->init_cb;
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
 
         /* Clear outstanding commands array. */
-        for (cnt = 0; cnt < MAX_OUTSTANDING_COMMANDS; cnt++)
-                req->outstanding_cmds[cnt] = NULL;
+        for (que = 0; que < ha->max_queues; que++) {
+                req = ha->req_q_map[que];
+                if (!req)
+                        continue;
+                for (cnt = 0; cnt < MAX_OUTSTANDING_COMMANDS; cnt++)
+                        req->outstanding_cmds[cnt] = NULL;
 
-        req->current_outstanding_cmd = 0;
+                req->current_outstanding_cmd = 0;
 
-        /* Clear RSCN queue. */
-        vha->rscn_in_ptr = 0;
-        vha->rscn_out_ptr = 0;
+                /* Initialize firmware. */
+                req->ring_ptr  = req->ring;
+                req->ring_index    = 0;
+                req->cnt      = req->length;
+        }
 
-        /* Initialize firmware. */
-        req->ring_ptr  = req->ring;
-        req->ring_index    = 0;
-        req->cnt      = req->length;
-        rsp->ring_ptr = rsp->ring;
-        rsp->ring_index    = 0;
+        for (que = 0; que < ha->max_queues; que++) {
+                rsp = ha->rsp_q_map[que];
+                if (!rsp)
+                        continue;
+                rsp->ring_ptr = rsp->ring;
+                rsp->ring_index    = 0;
 
-        /* Initialize response queue entries */
-        qla2x00_init_response_q_entries(rsp);
+                /* Initialize response queue entries */
+                qla2x00_init_response_q_entries(rsp);
+        }
 
+        /* Clear RSCN queue. */
+        list_for_each_entry(vp, &ha->vp_list, list) {
+                vp->rscn_in_ptr = 0;
+                vp->rscn_out_ptr = 0;
+        }
         ha->isp_ops->config_rings(vha);
 
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
@@ -3212,8 +3225,8 @@ qla2x00_loop_resync(scsi_qla_host_t *vha)
         int rval = QLA_SUCCESS;
         uint32_t wait_time;
         struct qla_hw_data *ha = vha->hw;
-        struct req_que *req = ha->req_q_map[0];
-        struct rsp_que *rsp = ha->rsp_q_map[0];
+        struct req_que *req = ha->req_q_map[vha->req_ques[0]];
+        struct rsp_que *rsp = req->rsp;
 
         atomic_set(&vha->loop_state, LOOP_UPDATE);
         clear_bit(ISP_ABORT_RETRY, &vha->dpc_flags);
@@ -3492,6 +3505,7 @@ qla25xx_init_queues(struct qla_hw_data *ha)
                 }
                 req = ha->req_q_map[i];
                 if (req) {
+                /* Clear outstanding commands array. */
                         req->options &= ~BIT_0;
                         ret = qla25xx_init_req_que(base_vha, req, req->options);
                         if (ret != QLA_SUCCESS)
@@ -3500,7 +3514,7 @@ qla25xx_init_queues(struct qla_hw_data *ha)
                                                 req->id));
                         else
                                 DEBUG2_17(printk(KERN_WARNING
-                                        "%s Rsp que:%d inited\n", __func__,
+                                        "%s Req que:%d inited\n", __func__,
                                                 req->id));
                 }
         }
@@ -4151,8 +4165,8 @@ qla24xx_configure_vhba(scsi_qla_host_t *vha)
         uint16_t mb[MAILBOX_REGISTER_COUNT];
         struct qla_hw_data *ha = vha->hw;
         struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);
-        struct req_que *req = ha->req_q_map[0];
-        struct rsp_que *rsp = ha->rsp_q_map[0];
+        struct req_que *req = ha->req_q_map[vha->req_ques[0]];
+        struct rsp_que *rsp = req->rsp;
 
         if (!vha->vp_idx)
                 return -EINVAL;
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index 886323130fcc..f53179c46423 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -629,6 +629,7 @@ qla25xx_create_req_que(struct qla_hw_data *ha, uint16_t options,
         req->ring_index = 0;
         req->cnt = req->length;
         req->id = que_id;
+        req->max_q_depth = ha->req_q_map[0]->max_q_depth;
         mutex_unlock(&ha->vport_lock);
 
         ret = qla25xx_init_req_que(base_vha, req, options);
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 4a71f522f925..cf32653fe01a 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1158,8 +1158,8 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res)
         struct req_que *req;
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
-        for (que = 0; que < QLA_MAX_HOST_QUES; que++) {
-                req = ha->req_q_map[vha->req_ques[que]];
+        for (que = 0; que < ha->max_queues; que++) {
+                req = ha->req_q_map[que];
                 if (!req)
                         continue;
                 for (cnt = 1; cnt < MAX_OUTSTANDING_COMMANDS; cnt++) {
@@ -1193,7 +1193,7 @@ qla2xxx_slave_configure(struct scsi_device *sdev)
         scsi_qla_host_t *vha = shost_priv(sdev->host);
         struct qla_hw_data *ha = vha->hw;
         struct fc_rport *rport = starget_to_rport(sdev->sdev_target);
-        struct req_que *req = ha->req_q_map[0];
+        struct req_que *req = ha->req_q_map[vha->req_ques[0]];
 
         if (sdev->tagged_supported)
                 scsi_activate_tcq(sdev, req->max_q_depth);
@@ -1998,7 +1998,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         return 0;
 
 probe_failed:
-        qla2x00_free_que(ha, req, rsp);
         qla2x00_free_device(base_vha);
 
         scsi_host_put(base_vha->host);
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 42e72a2c1f98..cbcd3f681b62 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -1095,7 +1095,8 @@ EXPORT_SYMBOL(__starget_for_each_device);
  * Description: Looks up the scsi_device with the specified @lun for a given
  * @starget.  The returned scsi_device does not have an additional
  * reference.  You must hold the host's host_lock over this call and
- * any access to the returned scsi_device.
+ * any access to the returned scsi_device. A scsi_device in state
+ * SDEV_DEL is skipped.
  *
  * Note:  The only reason why drivers should use this is because
  * they need to access the device list in irq context.  Otherwise you
@@ -1107,6 +1108,8 @@ struct scsi_device *__scsi_device_lookup_by_target(struct scsi_target *starget,
         struct scsi_device *sdev;
 
         list_for_each_entry(sdev, &starget->devices, same_target_siblings) {
+                if (sdev->sdev_state == SDEV_DEL)
+                        continue;
                 if (sdev->lun ==lun)
                         return sdev;
         }
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index 4969e4ec75ea..099b5455bbce 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -224,6 +224,7 @@ static struct {
         {"SGI", "TP9100", "*", BLIST_REPORTLUN2},
         {"SGI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
         {"IBM", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
+        {"SUN", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
         {"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN | BLIST_INQUIRY_36},
         {"SONY", "CD-ROM CDU-8001", NULL, BLIST_BORKEN},
         {"SONY", "TSL", NULL, BLIST_FORCELUN},          /* DDS3 & DDS4 autoloaders */