scsi: qla2xxx: target: Improve debug output for term exchange

Print better debug info when terminating a command, and print the
response status from the hardware.

Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
Link: https://patch.msgid.link/22f8a0b6-0e24-474d-9f28-9d65c9b7af03@cybernetics.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 5136549005e7ecb9fef8f3d66d2cef66dba06002..ff4124eccc9c7a2270fba50e0ff8a20e86e9078b 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -54,7 +54,7 @@
  * | Misc                         |       0xd303       | 0xd031-0xd0ff |
  * |                              |                    | 0xd101-0xd1fe |
  * |                              |                    | 0xd214-0xd2fe |
- * | Target Mode                 |       0xe081       |                |
+ * | Target Mode                 |       0xe084       |                |
  * | Target Mode Management      |       0xf09b       | 0xf002         |
  * |                              |                    | 0xf046-0xf049  |
  * | Target Mode Task Management  |      0x1000d      |                |

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index df5c9aac561705ec3803863cf4d5b2e2cf4beda5..72c74f8f537517301b73e61eaec180c3fb5f2ced 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -1909,6 +1909,10 @@ static void qlt_24xx_retry_term_exchange(struct scsi_qla_host *vha,
         * ABTS response. So, in it ID fields are reversed.
         */
 
+       ql_dbg(ql_dbg_tgt_mgt, vha, 0xe082,
+           "qla_target(%d): tag %u: Sending TERM EXCH CTIO for ABTS\n",
+           vha->vp_idx, le32_to_cpu(entry->exchange_addr_to_abort));
+
        ctio->entry_type = CTIO_TYPE7;
        ctio->entry_count = 1;
        ctio->nport_handle = entry->nport_handle;
@@ -3620,16 +3624,24 @@ static int __qlt_send_term_exchange(struct qla_qpair *qpair,
 {
        struct scsi_qla_host *vha = qpair->vha;
        struct ctio7_to_24xx *ctio24;
-       struct qla_hw_data *ha = vha->hw;
        request_t *pkt;
        int ret = 0;
        uint16_t temp;
 
-       ql_dbg(ql_dbg_tgt, vha, 0xe009, "Sending TERM EXCH CTIO (ha=%p)\n", ha);
-
        if (cmd)
                vha = cmd->vha;
 
+       if (cmd) {
+               ql_dbg(ql_dbg_tgt_mgt, vha, 0xe009,
+                   "qla_target(%d): tag %lld: Sending TERM EXCH CTIO state %d cmd_sent_to_fw %u\n",
+                   vha->vp_idx, cmd->se_cmd.tag, cmd->state,
+                   cmd->cmd_sent_to_fw);
+       } else {
+               ql_dbg(ql_dbg_tgt_mgt, vha, 0xe009,
+                   "qla_target(%d): tag %u: Sending TERM EXCH CTIO (no cmd)\n",
+                   vha->vp_idx, le32_to_cpu(atio->u.isp24.exchange_addr));
+       }
+
        pkt = (request_t *)qla2x00_alloc_iocbs_ready(qpair, NULL);
        if (pkt == NULL) {
                ql_dbg(ql_dbg_tgt, vha, 0xe050,
@@ -3920,6 +3932,7 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha,
        struct se_cmd *se_cmd;
        struct qla_tgt_cmd *cmd;
        struct qla_qpair *qpair = rsp->qpair;
+       uint16_t ctio_flags;
 
        if (handle & CTIO_INTERMEDIATE_HANDLE_MARK) {
                /* That could happen only in case of an error/reset/abort */
@@ -3931,11 +3944,28 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha,
                return;
        }
 
+       ctio_flags = le16_to_cpu(ctio->flags);
+
        cmd = qlt_ctio_to_cmd(vha, rsp, handle, ctio);
-       if (cmd == NULL)
+       if (unlikely(cmd == NULL)) {
+               if ((handle & ~QLA_TGT_HANDLE_MASK) == QLA_TGT_SKIP_HANDLE &&
+                   (ctio_flags & 0xe1ff) == (CTIO7_FLAGS_STATUS_MODE_1 |
+                    CTIO7_FLAGS_TERMINATE)) {
+                       u32 tag = le32_to_cpu(ctio->exchange_address);
+
+                       if (status == CTIO_SUCCESS)
+                               ql_dbg(ql_dbg_tgt_mgt, vha, 0xe083,
+                                   "qla_target(%d): tag %u: term exchange successful\n",
+                                   vha->vp_idx, tag);
+                       else
+                               ql_dbg(ql_dbg_tgt_mgt, vha, 0xe084,
+                                   "qla_target(%d): tag %u: term exchange failed; status = 0x%x\n",
+                                   vha->vp_idx, tag, status);
+               }
                return;
+       }
 
-       if ((le16_to_cpu(ctio->flags) & CTIO7_FLAGS_DATA_OUT) && cmd->sess)
+       if ((ctio_flags & CTIO7_FLAGS_DATA_OUT) && cmd->sess)
                qlt_chk_edif_rx_sa_delete_pending(vha, cmd->sess, ctio);
 
        se_cmd = &cmd->se_cmd;