2 files changed, 37 insertions, 31 deletions

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 993dd25279ff..52a87657c7dd 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -3065,6 +3065,26 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)
                         atomic_set(&vha->loop_state, LOOP_READY);
                         ql_dbg(ql_dbg_disc, vha, 0x2069,
                             "LOOP READY.\n");
+
+                        /*
+                         * Process any ATIO queue entries that came in
+                         * while we weren't online.
+                         */
+                        if (qla_tgt_mode_enabled(vha)) {
+                                if (IS_QLA27XX(ha) || IS_QLA83XX(ha)) {
+                                        spin_lock_irqsave(&ha->tgt.atio_lock,
+                                            flags);
+                                        qlt_24xx_process_atio_queue(vha, 0);
+                                        spin_unlock_irqrestore(
+                                            &ha->tgt.atio_lock, flags);
+                                } else {
+                                        spin_lock_irqsave(&ha->hardware_lock,
+                                            flags);
+                                        qlt_24xx_process_atio_queue(vha, 1);
+                                        spin_unlock_irqrestore(
+                                            &ha->hardware_lock, flags);
+                                }
+                        }
                 }
         }
 
@@ -4919,7 +4939,6 @@ qla2x00_restart_isp(scsi_qla_host_t *vha)
         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];
-        unsigned long flags, flags2;
 
         /* If firmware needs to be loaded */
         if (qla2x00_isp_firmware(vha)) {
@@ -4941,19 +4960,6 @@ qla2x00_restart_isp(scsi_qla_host_t *vha)
                         /* Issue a marker after FW becomes ready. */
                         qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL);
 
-                        vha->flags.online = 1;
-
-                        /*
-                         * Process any ATIO queue entries that came in
-                         * while we weren't online.
-                         */
-                        spin_lock_irqsave(&ha->hardware_lock, flags);
-                        spin_lock_irqsave(&ha->tgt.atio_lock, flags2);
-                        if (qla_tgt_mode_enabled(vha))
-                                qlt_24xx_process_atio_queue(vha, 1);
-                        spin_unlock_irqrestore(&ha->tgt.atio_lock, flags2);
-                        spin_unlock_irqrestore(&ha->hardware_lock, flags);
-
                         set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);
                 }
 
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index da35f51ea256..c7ab9e69c881 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -229,7 +229,7 @@ static inline void qlt_decr_num_pend_cmds(struct scsi_qla_host *vha)
         spin_unlock_irqrestore(&vha->hw->tgt.q_full_lock, flags);
 }
 
-static void qlt_24xx_atio_pkt_all_vps(struct scsi_qla_host *vha,
+static bool qlt_24xx_atio_pkt_all_vps(struct scsi_qla_host *vha,
         struct atio_from_isp *atio, uint8_t ha_locked)
 {
         ql_dbg(ql_dbg_tgt, vha, 0xe072,
@@ -285,7 +285,7 @@ static void qlt_24xx_atio_pkt_all_vps(struct scsi_qla_host *vha,
                 break;
         }
 
-        return;
+        return false;
 }
 
 void qlt_response_pkt_all_vps(struct scsi_qla_host *vha, response_t *pkt)
@@ -1738,15 +1738,15 @@ void qlt_xmit_tm_rsp(struct qla_tgt_mgmt_cmd *mcmd)
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
 
-        if (qla2x00_reset_active(vha) || mcmd->reset_count != ha->chip_reset) {
+        if (!vha->flags.online || mcmd->reset_count != ha->chip_reset) {
                 /*
-                 * Either a chip reset is active or this request was from
+                 * Either the port is not online or this request was from
                  * previous life, just abort the processing.
                  */
                 ql_dbg(ql_dbg_async, vha, 0xe100,
-                        "RESET-TMR active/old-count/new-count = %d/%d/%d.\n",
-                        qla2x00_reset_active(vha), mcmd->reset_count,
-                        ha->chip_reset);
+                        "RESET-TMR online/active/old-count/new-count = %d/%d/%d/%d.\n",
+                        vha->flags.online, qla2x00_reset_active(vha),
+                        mcmd->reset_count, ha->chip_reset);
                 ha->tgt.tgt_ops->free_mcmd(mcmd);
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
                 return;
@@ -2693,17 +2693,17 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
         else
                 vha->tgt_counters.core_qla_que_buf++;
 
-        if (qla2x00_reset_active(vha) || cmd->reset_count != ha->chip_reset) {
+        if (!vha->flags.online || cmd->reset_count != ha->chip_reset) {
                 /*
-                 * Either a chip reset is active or this request was from
+                 * Either the port is not online or this request was from
                  * previous life, just abort the processing.
                  */
                 cmd->state = QLA_TGT_STATE_PROCESSED;
                 qlt_abort_cmd_on_host_reset(cmd->vha, cmd);
                 ql_dbg(ql_dbg_async, vha, 0xe101,
-                        "RESET-RSP active/old-count/new-count = %d/%d/%d.\n",
-                        qla2x00_reset_active(vha), cmd->reset_count,
-                        ha->chip_reset);
+                        "RESET-RSP online/active/old-count/new-count = %d/%d/%d/%d.\n",
+                        vha->flags.online, qla2x00_reset_active(vha),
+                        cmd->reset_count, ha->chip_reset);
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
                 return 0;
         }
@@ -2834,18 +2834,18 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd)
 
         spin_lock_irqsave(&ha->hardware_lock, flags);
 
-        if (qla2x00_reset_active(vha) || (cmd->reset_count != ha->chip_reset) ||
+        if (!vha->flags.online || (cmd->reset_count != ha->chip_reset) ||
             (cmd->sess && cmd->sess->deleted == QLA_SESS_DELETION_IN_PROGRESS)) {
                 /*
-                 * Either a chip reset is active or this request was from
+                 * Either the port is not online or this request was from
                  * previous life, just abort the processing.
                  */
                 cmd->state = QLA_TGT_STATE_NEED_DATA;
                 qlt_abort_cmd_on_host_reset(cmd->vha, cmd);
                 ql_dbg(ql_dbg_async, vha, 0xe102,
-                        "RESET-XFR active/old-count/new-count = %d/%d/%d.\n",
-                        qla2x00_reset_active(vha), cmd->reset_count,
-                        ha->chip_reset);
+                        "RESET-XFR online/active/old-count/new-count = %d/%d/%d/%d.\n",
+                        vha->flags.online, qla2x00_reset_active(vha),
+                        cmd->reset_count, ha->chip_reset);
                 spin_unlock_irqrestore(&ha->hardware_lock, flags);
                 return 0;
         }