scsi: lpfc: Move MI module parameter check to handle dynamic disable

lpfc_refresh_params() can be called for an async event handler. This could
potentially override the value initialized by lpfc_cmf_setup().

Move module parameter check to lpfc_refresh_params().

Link: https://lore.kernel.org/r/20220412222008.126521-14-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_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 7dfd47dcaad937c59d149ed18f53f665da6b987f..ec6da7e27e4b348f2f7ca3a9ec4e1ace83a75cc5 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -686,8 +686,14 @@ lpfc_sli4_refresh_params(struct lpfc_hba *phba)
                return rc;
        }
        mbx_sli4_parameters = &mqe->un.get_sli4_parameters.sli4_parameters;
-       phba->sli4_hba.pc_sli4_params.mi_ver =
+
+       /* Are we forcing MI off via module parameter? */
+       if (phba->cfg_enable_mi)
+               phba->sli4_hba.pc_sli4_params.mi_ver =
                        bf_get(cfg_mi_ver, mbx_sli4_parameters);
+       else
+               phba->sli4_hba.pc_sli4_params.mi_ver = 0;
+
        phba->sli4_hba.pc_sli4_params.cmf =
                        bf_get(cfg_cmf, mbx_sli4_parameters);
        phba->sli4_hba.pc_sli4_params.pls =

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index ca7766940b4e6e3c03e094f628d491ff7e2e3ab4..3b9359c1ee1c5e1c33b66ac8942f47bafce7146b 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -7994,10 +7994,6 @@ lpfc_cmf_setup(struct lpfc_hba *phba)
 
        sli4_params = &phba->sli4_hba.pc_sli4_params;
 
-       /* Are we forcing MI off via module parameter? */
-       if (!phba->cfg_enable_mi)
-               sli4_params->mi_ver = 0;
-
        /* Always try to enable MI feature if we can */
        if (sli4_params->mi_ver) {
                lpfc_set_features(phba, mboxq, LPFC_SET_ENABLE_MI);