scsi: lpfc: Alter FPIN stat accounting logic

When configuring CMF management based on signals instead of FPINs, FPIN
alarm and warning statistics are not tracked.

Change the behavior so that FPIN alarms and warnings are always tracked
regardless of the configured mode.

Similar changes are made in the CMF signal stat accounting logic.  Upon
receipt of a signal, only track signaled alarms and warnings. FPIN stats
should not be incremented upon receipt of a signal.

Link: https://lore.kernel.org/r/20220506035519.50908-11-jsmart2021@gmail.com
Co-developed-by: Justin Tee <justin.tee@broadcom.com>
Signed-off-by: Justin Tee <justin.tee@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 33fac44..51c505d 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -3854,9 +3854,6 @@ lpfc_least_capable_settings(struct lpfc_hba *phba,
 {
        u32 rsp_sig_cap = 0, drv_sig_cap = 0;
        u32 rsp_sig_freq_cyc = 0, rsp_sig_freq_scale = 0;
-       struct lpfc_cgn_info *cp;
-       u32 crc;
-       u16 sig_freq;
 
        /* Get rsp signal and frequency capabilities.  */
        rsp_sig_cap = be32_to_cpu(pcgd->xmt_signal_capability);
@@ -3912,25 +3909,7 @@ lpfc_least_capable_settings(struct lpfc_hba *phba,
                }
        }
 
-       if (!phba->cgn_i)
-               return;
-
-       /* Update signal frequency in congestion info buffer */
-       cp = (struct lpfc_cgn_info *)phba->cgn_i->virt;
-
-       /* Frequency (in ms) Signal Warning/Signal Congestion Notifications
-        * are received by the HBA
-        */
-       sig_freq = phba->cgn_sig_freq;
-
-       if (phba->cgn_reg_signal == EDC_CG_SIG_WARN_ONLY)
-               cp->cgn_warn_freq = cpu_to_le16(sig_freq);
-       if (phba->cgn_reg_signal == EDC_CG_SIG_WARN_ALARM) {
-               cp->cgn_alarm_freq = cpu_to_le16(sig_freq);
-               cp->cgn_warn_freq = cpu_to_le16(sig_freq);
-       }
-       crc = lpfc_cgn_calc_crc32(cp, LPFC_CGN_INFO_SZ, LPFC_CGN_CRC32_SEED);
-       cp->cgn_info_crc = cpu_to_le32(crc);
+       /* We are NOT recording signal frequency in congestion info buffer */
        return;
 
 out_no_support:
@@ -9919,11 +9898,14 @@ lpfc_els_rcv_fpin_cgn(struct lpfc_hba *phba, struct fc_tlv_desc *tlv)
                        /* Take action here for an Alarm event */
                        if (phba->cmf_active_mode != LPFC_CFG_OFF) {
                                if (phba->cgn_reg_fpin & LPFC_CGN_FPIN_ALARM) {
-                                       /* Track of alarm cnt for cgn_info */
-                                       atomic_inc(&phba->cgn_fabric_alarm_cnt);
                                        /* Track of alarm cnt for SYNC_WQE */
                                        atomic_inc(&phba->cgn_sync_alarm_cnt);
                                }
+                               /* Track alarm cnt for cgn_info regardless
+                                * of whether CMF is configured for Signals
+                                * or FPINs.
+                                */
+                               atomic_inc(&phba->cgn_fabric_alarm_cnt);
                                goto cleanup;
                        }
                        break;
@@ -9931,11 +9913,14 @@ lpfc_els_rcv_fpin_cgn(struct lpfc_hba *phba, struct fc_tlv_desc *tlv)
                        /* Take action here for a Warning event */
                        if (phba->cmf_active_mode != LPFC_CFG_OFF) {
                                if (phba->cgn_reg_fpin & LPFC_CGN_FPIN_WARN) {
-                                       /* Track of warning cnt for cgn_info */
-                                       atomic_inc(&phba->cgn_fabric_warn_cnt);
                                        /* Track of warning cnt for SYNC_WQE */
                                        atomic_inc(&phba->cgn_sync_warn_cnt);
                                }
+                               /* Track warning cnt and freq for cgn_info
+                                * regardless of whether CMF is configured for
+                                * Signals or FPINs.
+                                */
+                               atomic_inc(&phba->cgn_fabric_warn_cnt);
 cleanup:
                                /* Save frequency in ms */
                                phba->cgn_fpin_frequency =
@@ -9944,14 +9929,10 @@ cleanup:
                                if (phba->cgn_i) {
                                        cp = (struct lpfc_cgn_info *)
                                                phba->cgn_i->virt;
-                                       if (phba->cgn_reg_fpin &
-                                               LPFC_CGN_FPIN_ALARM)
-                                               cp->cgn_alarm_freq =
-                                                       cpu_to_le16(value);
-                                       if (phba->cgn_reg_fpin &
-                                               LPFC_CGN_FPIN_WARN)
-                                               cp->cgn_warn_freq =
-                                                       cpu_to_le16(value);
+                                       cp->cgn_alarm_freq =
+                                               cpu_to_le16(value);
+                                       cp->cgn_warn_freq =
+                                               cpu_to_le16(value);
                                        crc = lpfc_cgn_calc_crc32
                                                (cp,
                                                LPFC_CGN_INFO_SZ,

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 0dedb7c..2bffaa6 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -5864,21 +5864,8 @@ lpfc_cgn_save_evt_cnt(struct lpfc_hba *phba)
 
        /* Use the frequency found in the last rcv'ed FPIN */
        value = phba->cgn_fpin_frequency;
-       if (phba->cgn_reg_fpin & LPFC_CGN_FPIN_WARN)
-               cp->cgn_warn_freq = cpu_to_le16(value);
-       if (phba->cgn_reg_fpin & LPFC_CGN_FPIN_ALARM)
-               cp->cgn_alarm_freq = cpu_to_le16(value);
-
-       /* Frequency (in ms) Signal Warning/Signal Congestion Notifications
-        * are received by the HBA
-        */
-       value = phba->cgn_sig_freq;
-
-       if (phba->cgn_reg_signal == EDC_CG_SIG_WARN_ONLY ||
-           phba->cgn_reg_signal == EDC_CG_SIG_WARN_ALARM)
-               cp->cgn_warn_freq = cpu_to_le16(value);
-       if (phba->cgn_reg_signal == EDC_CG_SIG_WARN_ALARM)
-               cp->cgn_alarm_freq = cpu_to_le16(value);
+       cp->cgn_warn_freq = cpu_to_le16(value);
+       cp->cgn_alarm_freq = cpu_to_le16(value);
 
        lvalue = lpfc_cgn_calc_crc32(cp, LPFC_CGN_INFO_SZ,
                                     LPFC_CGN_CRC32_SEED);
@@ -6585,9 +6572,6 @@ lpfc_sli4_async_sli_evt(struct lpfc_hba *phba, struct lpfc_acqe_sli *acqe_sli)
                /* Alarm overrides warning, so check that first */
                if (cgn_signal->alarm_cnt) {
                        if (phba->cgn_reg_signal == EDC_CG_SIG_WARN_ALARM) {
-                               /* Keep track of alarm cnt for cgn_info */
-                               atomic_add(cgn_signal->alarm_cnt,
-                                          &phba->cgn_fabric_alarm_cnt);
                                /* Keep track of alarm cnt for CMF_SYNC_WQE */
                                atomic_add(cgn_signal->alarm_cnt,
                                           &phba->cgn_sync_alarm_cnt);
@@ -6596,8 +6580,6 @@ lpfc_sli4_async_sli_evt(struct lpfc_hba *phba, struct lpfc_acqe_sli *acqe_sli)
                        /* signal action needs to be taken */
                        if (phba->cgn_reg_signal == EDC_CG_SIG_WARN_ONLY ||
                            phba->cgn_reg_signal == EDC_CG_SIG_WARN_ALARM) {
-                               /* Keep track of warning cnt for cgn_info */
-                               atomic_add(cnt, &phba->cgn_fabric_warn_cnt);
                                /* Keep track of warning cnt for CMF_SYNC_WQE */
                                atomic_add(cnt, &phba->cgn_sync_warn_cnt);
                        }