2 files changed, 18 insertions, 3 deletions

diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h
index 9e2b9b227e1a..4aecb5c4e602 100644
--- a/drivers/scsi/lpfc/lpfc_hw4.h
+++ b/drivers/scsi/lpfc/lpfc_hw4.h
@@ -338,6 +338,12 @@ struct lpfc_cqe {
 #define CQE_CODE_XRI_ABORTED            0x5
 #define CQE_CODE_RECEIVE_V1             0x9
 
+/*
+ * Define mask value for xri_aborted and wcqe completed CQE extended status.
+ * Currently, extended status is limited to 9 bits (0x0 -> 0x103) .
+ */
+#define WCQE_PARAM_MASK         0x1FF;
+
 /* completion queue entry for wqe completions */
 struct lpfc_wcqe_complete {
         uint32_t word0;
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 99afe1522273..c516b040d45c 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -8388,6 +8388,7 @@ lpfc_sli4_abts_err_handler(struct lpfc_hba *phba,
                            struct sli4_wcqe_xri_aborted *axri)
 {
         struct lpfc_vport *vport;
+        uint32_t ext_status = 0;
 
         if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)) {
                 lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
@@ -8399,12 +8400,20 @@ lpfc_sli4_abts_err_handler(struct lpfc_hba *phba,
         vport = ndlp->vport;
         lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,
                         "3116 Port generated FCP XRI ABORT event on "
-                        "vpi %d rpi %d xri x%x status 0x%x\n",
+                        "vpi %d rpi %d xri x%x status 0x%x parameter x%x\n",
                         ndlp->vport->vpi, ndlp->nlp_rpi,
                         bf_get(lpfc_wcqe_xa_xri, axri),
-                        bf_get(lpfc_wcqe_xa_status, axri));
+                        bf_get(lpfc_wcqe_xa_status, axri),
+                        axri->parameter);
 
-        if (bf_get(lpfc_wcqe_xa_status, axri) == IOSTAT_LOCAL_REJECT)
+        /*
+         * Catch the ABTS protocol failure case.  Older OCe FW releases returned
+         * LOCAL_REJECT and 0 for a failed ABTS exchange and later OCe and
+         * LPe FW releases returned LOCAL_REJECT and SEQUENCE_TIMEOUT.
+         */
+        ext_status = axri->parameter & WCQE_PARAM_MASK;
+        if ((bf_get(lpfc_wcqe_xa_status, axri) == IOSTAT_LOCAL_REJECT) &&
+            ((ext_status == IOERR_SEQUENCE_TIMEOUT) || (ext_status == 0)))
                 lpfc_sli_abts_recover_port(vport, ndlp);
 }