5 files changed, 26 insertions, 53 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_fw.h b/drivers/scsi/qla4xxx/ql4_fw.h
index ed8ee66a7da5..1b667a70cffa 100644
--- a/drivers/scsi/qla4xxx/ql4_fw.h
+++ b/drivers/scsi/qla4xxx/ql4_fw.h
@@ -678,7 +678,8 @@ struct qla4_marker_entry {
         uint32_t system_defined; /* 04-07 */
         uint16_t target;        /* 08-09 */
         uint16_t modifier;      /* 0A-0B */
-#define MM_LUN_RESET         0
+#define MM_LUN_RESET            0
+#define MM_TGT_WARM_RESET       1
 
         uint16_t flags;         /* 0C-0D */
         uint16_t reserved1;     /* 0E-0F */
diff --git a/drivers/scsi/qla4xxx/ql4_glbl.h b/drivers/scsi/qla4xxx/ql4_glbl.h
index b403a17106c5..96ebfb021f6c 100644
--- a/drivers/scsi/qla4xxx/ql4_glbl.h
+++ b/drivers/scsi/qla4xxx/ql4_glbl.h
@@ -70,6 +70,8 @@ int qla4xxx_reinitialize_ddb_list(struct scsi_qla_host * ha);
 int qla4xxx_process_ddb_changed(struct scsi_qla_host * ha,
                                 uint32_t fw_ddb_index, uint32_t state);
 void qla4xxx_dump_buffer(void *b, uint32_t size);
+int qla4xxx_send_marker_iocb(struct scsi_qla_host *ha,
+        struct ddb_entry *ddb_entry, int lun, uint16_t mrkr_mod);
 
 extern int ql4xextended_error_logging;
 extern int ql4xdiscoverywait;
diff --git a/drivers/scsi/qla4xxx/ql4_iocb.c b/drivers/scsi/qla4xxx/ql4_iocb.c
index e4461b5d767a..912a67494adf 100644
--- a/drivers/scsi/qla4xxx/ql4_iocb.c
+++ b/drivers/scsi/qla4xxx/ql4_iocb.c
@@ -66,8 +66,8 @@ static int qla4xxx_get_req_pkt(struct scsi_qla_host *ha,
  *
  * This routine issues a marker IOCB.
  **/
-static int qla4xxx_send_marker_iocb(struct scsi_qla_host *ha,
-                                    struct ddb_entry *ddb_entry, int lun)
+int qla4xxx_send_marker_iocb(struct scsi_qla_host *ha,
+        struct ddb_entry *ddb_entry, int lun, uint16_t mrkr_mod)
 {
         struct qla4_marker_entry *marker_entry;
         unsigned long flags = 0;
@@ -87,7 +87,7 @@ static int qla4xxx_send_marker_iocb(struct scsi_qla_host *ha,
         marker_entry->hdr.entryType = ET_MARKER;
         marker_entry->hdr.entryCount = 1;
         marker_entry->target = cpu_to_le16(ddb_entry->fw_ddb_index);
-        marker_entry->modifier = cpu_to_le16(MM_LUN_RESET);
+        marker_entry->modifier = cpu_to_le16(mrkr_mod);
         int_to_scsilun(lun, &marker_entry->lun);
         wmb();
 
@@ -210,14 +210,6 @@ int qla4xxx_send_command_to_isp(struct scsi_qla_host *ha, struct srb * srb)
         /* Get real lun and adapter */
         ddb_entry = srb->ddb;
 
-        /* Send marker(s) if needed. */
-        if (ha->marker_needed == 1) {
-                if (qla4xxx_send_marker_iocb(ha, ddb_entry,
-                                             cmd->device->lun) != QLA_SUCCESS)
-                        return QLA_ERROR;
-
-                ha->marker_needed = 0;
-        }
         tot_dsds = 0;
 
         /* Acquire hardware specific lock */
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index fc84db4069f4..a91a57c57bff 100644
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -11,28 +11,6 @@
 #include "ql4_inline.h"
 
 /**
- * qla2x00_process_completed_request() - Process a Fast Post response.
- * @ha: SCSI driver HA context
- * @index: SRB index
- **/
-static void qla4xxx_process_completed_request(struct scsi_qla_host *ha,
-                                              uint32_t index)
-{
-        struct srb *srb;
-
-        srb = qla4xxx_del_from_active_array(ha, index);
-        if (srb) {
-                /* Save ISP completion status */
-                srb->cmd->result = DID_OK << 16;
-                qla4xxx_srb_compl(ha, srb);
-        } else {
-                DEBUG2(printk("scsi%ld: Invalid ISP SCSI completion handle = "
-                              "%d\n", ha->host_no, index));
-                set_bit(DPC_RESET_HA, &ha->dpc_flags);
-        }
-}
-
-/**
  * qla4xxx_status_entry - processes status IOCBs
  * @ha: Pointer to host adapter structure.
  * @sts_entry: Pointer to status entry structure.
@@ -47,14 +25,6 @@ static void qla4xxx_status_entry(struct scsi_qla_host *ha,
         uint32_t residual;
         uint16_t sensebytecnt;
 
-        if (sts_entry->completionStatus == SCS_COMPLETE &&
-            sts_entry->scsiStatus == 0) {
-                qla4xxx_process_completed_request(ha,
-                                                  le32_to_cpu(sts_entry->
-                                                              handle));
-                return;
-        }
-
         srb = qla4xxx_del_from_active_array(ha, le32_to_cpu(sts_entry->handle));
         if (!srb) {
                 /* FIXMEdg: Don't we need to reset ISP in this case??? */
@@ -62,6 +32,9 @@ static void qla4xxx_status_entry(struct scsi_qla_host *ha,
                               "handle 0x%x, sp=%p. This cmd may have already "
                               "been completed.\n", ha->host_no, __func__,
                               le32_to_cpu(sts_entry->handle), srb));
+                dev_warn(&ha->pdev->dev, "%s invalid status entry:"
+                        " handle=0x%0x\n", __func__, sts_entry->handle);
+                set_bit(DPC_RESET_HA, &ha->dpc_flags);
                 return;
         }
 
@@ -88,10 +61,6 @@ static void qla4xxx_status_entry(struct scsi_qla_host *ha,
         scsi_status = sts_entry->scsiStatus;
         switch (sts_entry->completionStatus) {
         case SCS_COMPLETE:
-                if (scsi_status == 0) {
-                        cmd->result = DID_OK << 16;
-                        break;
-                }
 
                 if (sts_entry->iscsiFlags & ISCSI_FLAG_RESIDUAL_OVER) {
                         cmd->result = DID_ERROR << 16;
@@ -100,7 +69,8 @@ static void qla4xxx_status_entry(struct scsi_qla_host *ha,
 
                 if (sts_entry->iscsiFlags &ISCSI_FLAG_RESIDUAL_UNDER) {
                         scsi_set_resid(cmd, residual);
-                        if ((scsi_bufflen(cmd) - residual) < cmd->underflow) {
+                        if (!scsi_status && ((scsi_bufflen(cmd) - residual) <
+                                cmd->underflow)) {
 
                                 cmd->result = DID_ERROR << 16;
 
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 31e605caf0f1..0c786944d2c2 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1552,9 +1552,6 @@ static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd)
                 goto eh_dev_reset_done;
         }
 
-        /* Send marker. */
-        ha->marker_needed = 1;
-
         if (qla4xxx_eh_wait_for_commands(ha, scsi_target(cmd->device),
                                          cmd->device)) {
                 dev_info(&ha->pdev->dev,
@@ -1563,6 +1560,11 @@ static int qla4xxx_eh_device_reset(struct scsi_cmnd *cmd)
                 goto eh_dev_reset_done;
         }
 
+        /* Send marker. */
+        if (qla4xxx_send_marker_iocb(ha, ddb_entry, cmd->device->lun,
+                MM_LUN_RESET) != QLA_SUCCESS)
+                goto eh_dev_reset_done;
+
         dev_info(&ha->pdev->dev,
                    "scsi(%ld:%d:%d:%d): DEVICE RESET SUCCEEDED.\n",
                    ha->host_no, cmd->device->channel, cmd->device->id,
@@ -1606,9 +1608,6 @@ static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd)
                 return FAILED;
         }
 
-        /* Send marker. */
-        ha->marker_needed = 1;
-
         if (qla4xxx_eh_wait_for_commands(ha, scsi_target(cmd->device),
                                          NULL)) {
                 starget_printk(KERN_INFO, scsi_target(cmd->device),
@@ -1617,6 +1616,15 @@ static int qla4xxx_eh_target_reset(struct scsi_cmnd *cmd)
                 return FAILED;
         }
 
+        /* Send marker. */
+        if (qla4xxx_send_marker_iocb(ha, ddb_entry, cmd->device->lun,
+                MM_TGT_WARM_RESET) != QLA_SUCCESS) {
+                starget_printk(KERN_INFO, scsi_target(cmd->device),
+                               "WARM TARGET DEVICE RESET FAILED - "
+                               "marker iocb failed.\n");
+                return FAILED;
+        }
+
         starget_printk(KERN_INFO, scsi_target(cmd->device),
                        "WARM TARGET RESET SUCCEEDED.\n");
         return SUCCESS;