Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (40 commits)
  [SCSI] 3w-9xxx fix bug in sgl loading
  [SCSI] fcoe, libfc: adds enable/disable for fcoe interface
  [SCSI] libfc: reduce hold time on SCSI host lock
  [SCSI] libfc: remote port gets stuck in restart state without really restarting
  [SCSI] pm8001: misc code cleanup
  [SCSI] pm8001: enable read HBA SAS address from VPD
  [SCSI] pm8001: do not reset local sata as it will not be found if reset
  [SCSI] pm8001: bit set pm8001_ha->flags
  [SCSI] pm8001:fix potential NULL pointer dereference
  [SCSI] pm8001: set SSC down-spreading only to get less errors on some 6G device.
  [SCSI] pm8001: fix endian issues with SAS address
  [SCSI] pm8001: enhance error handle for IO patch
  [SCSI] pm8001: Fix for sata io circular lock dependency.
  [SCSI] hpsa: add driver for HP Smart Array controllers.
  [SCSI] cxgb3i: always use negative errno in case of error
  [SCSI] bnx2i: minor code cleanup and update driver version
  [SCSI] bnx2i: Task management ABORT TASK fixes
  [SCSI] bnx2i: update CQ arming algorith for 5771x chipsets
  [SCSI] bnx2i: Adjust sq_size module parametr to power of 2 only if a non-zero value is specified
  [SCSI] bnx2i: Add 5771E device support to bnx2i driver
  ...

1 files changed, 10 insertions, 93 deletions

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 804987397b77..1692a883f4de 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -811,78 +811,6 @@ skip_rio:
                 qla2x00_alert_all_vps(rsp, mb);
 }
 
-static void
-qla2x00_adjust_sdev_qdepth_up(struct scsi_device *sdev, void *data)
-{
-        fc_port_t *fcport = data;
-        struct scsi_qla_host *vha = fcport->vha;
-        struct qla_hw_data *ha = vha->hw;
-        struct req_que *req = NULL;
-
-        if (!ql2xqfulltracking)
-                return;
-
-        req = vha->req;
-        if (!req)
-                return;
-        if (req->max_q_depth <= sdev->queue_depth)
-                return;
-
-        if (sdev->ordered_tags)
-                scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG,
-                    sdev->queue_depth + 1);
-        else
-                scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG,
-                    sdev->queue_depth + 1);
-
-        fcport->last_ramp_up = jiffies;
-
-        DEBUG2(qla_printk(KERN_INFO, ha,
-            "scsi(%ld:%d:%d:%d): Queue depth adjusted-up to %d.\n",
-            fcport->vha->host_no, sdev->channel, sdev->id, sdev->lun,
-            sdev->queue_depth));
-}
-
-static void
-qla2x00_adjust_sdev_qdepth_down(struct scsi_device *sdev, void *data)
-{
-        fc_port_t *fcport = data;
-
-        if (!scsi_track_queue_full(sdev, sdev->queue_depth - 1))
-                return;
-
-        DEBUG2(qla_printk(KERN_INFO, fcport->vha->hw,
-            "scsi(%ld:%d:%d:%d): Queue depth adjusted-down to %d.\n",
-            fcport->vha->host_no, sdev->channel, sdev->id, sdev->lun,
-            sdev->queue_depth));
-}
-
-static inline void
-qla2x00_ramp_up_queue_depth(scsi_qla_host_t *vha, struct req_que *req,
-                                                                srb_t *sp)
-{
-        fc_port_t *fcport;
-        struct scsi_device *sdev;
-
-        if (!ql2xqfulltracking)
-                return;
-
-        sdev = sp->cmd->device;
-        if (sdev->queue_depth >= req->max_q_depth)
-                return;
-
-        fcport = sp->fcport;
-        if (time_before(jiffies,
-            fcport->last_ramp_up + ql2xqfullrampup * HZ))
-                return;
-        if (time_before(jiffies,
-            fcport->last_queue_full + ql2xqfullrampup * HZ))
-                return;
-
-        starget_for_each_device(sdev->sdev_target, fcport,
-            qla2x00_adjust_sdev_qdepth_up);
-}
-
 /**
  * qla2x00_process_completed_request() - Process a Fast Post response.
  * @ha: SCSI driver HA context
@@ -913,8 +841,6 @@ qla2x00_process_completed_request(struct scsi_qla_host *vha,
 
                 /* Save ISP completion status */
                 sp->cmd->result = DID_OK << 16;
-
-                qla2x00_ramp_up_queue_depth(vha, req, sp);
                 qla2x00_sp_compl(ha, sp);
         } else {
                 DEBUG2(printk("scsi(%ld) Req:%d: Invalid ISP SCSI completion"
@@ -1435,13 +1361,6 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                             "scsi(%ld): QUEUE FULL status detected "
                             "0x%x-0x%x.\n", vha->host_no, comp_status,
                             scsi_status));
-
-                        /* Adjust queue depth for all luns on the port. */
-                        if (!ql2xqfulltracking)
-                                break;
-                        fcport->last_queue_full = jiffies;
-                        starget_for_each_device(cp->device->sdev_target,
-                            fcport, qla2x00_adjust_sdev_qdepth_down);
                         break;
                 }
                 if (lscsi_status != SS_CHECK_CONDITION)
@@ -1516,17 +1435,6 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
                                     "scsi(%ld): QUEUE FULL status detected "
                                     "0x%x-0x%x.\n", vha->host_no, comp_status,
                                     scsi_status));
-
-                                /*
-                                 * Adjust queue depth for all luns on the
-                                 * port.
-                                 */
-                                if (!ql2xqfulltracking)
-                                        break;
-                                fcport->last_queue_full = jiffies;
-                                starget_for_each_device(
-                                    cp->device->sdev_target, fcport,
-                                    qla2x00_adjust_sdev_qdepth_down);
                                 break;
                         }
                         if (lscsi_status != SS_CHECK_CONDITION)
@@ -2020,7 +1928,7 @@ qla24xx_msix_rsp_q(int irq, void *dev_id)
 
         vha = qla25xx_get_host(rsp);
         qla24xx_process_response_queue(vha, rsp);
-        if (!ha->mqenable) {
+        if (!ha->flags.disable_msix_handshake) {
                 WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
                 RD_REG_DWORD_RELAXED(&reg->hccr);
         }
@@ -2034,6 +1942,7 @@ qla25xx_msix_rsp_q(int irq, void *dev_id)
 {
         struct qla_hw_data *ha;
         struct rsp_que *rsp;
+        struct device_reg_24xx __iomem *reg;
 
         rsp = (struct rsp_que *) dev_id;
         if (!rsp) {
@@ -2043,6 +1952,14 @@ qla25xx_msix_rsp_q(int irq, void *dev_id)
         }
         ha = rsp->hw;
 
+        /* Clear the interrupt, if enabled, for this response queue */
+        if (rsp->options & ~BIT_6) {
+                reg = &ha->iobase->isp24;
+                spin_lock_irq(&ha->hardware_lock);
+                WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
+                RD_REG_DWORD_RELAXED(&reg->hccr);
+                spin_unlock_irq(&ha->hardware_lock);
+        }
         queue_work_on((int) (rsp->id - 1), ha->wq, &rsp->q_work);
 
         return IRQ_HANDLED;