UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
James Smart 2022-04-12 15:19:55 -07:00 committed by Martin K. Petersen
parent d531d9874d
commit 39a1a86b9d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/scsi/lpfc/lpfc_init.c
View File

@ -686,8 +686,14 @@ lpfc_sli4_refresh_params(struct lpfc_hba *phba)
return rc; return rc;
} }
mbx_sli4_parameters = &mqe->un.get_sli4_parameters.sli4_parameters; 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); 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 = phba->sli4_hba.pc_sli4_params.cmf =
bf_get(cfg_cmf, mbx_sli4_parameters); bf_get(cfg_cmf, mbx_sli4_parameters);
phba->sli4_hba.pc_sli4_params.pls = phba->sli4_hba.pc_sli4_params.pls =

4
drivers/scsi/lpfc/lpfc_sli.c
View File

@ -7994,10 +7994,6 @@ lpfc_cmf_setup(struct lpfc_hba *phba)
sli4_params = &phba->sli4_hba.pc_sli4_params; 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 */ /* Always try to enable MI feature if we can */
if (sli4_params->mi_ver) { if (sli4_params->mi_ver) {
lpfc_set_features(phba, mboxq, LPFC_SET_ENABLE_MI); lpfc_set_features(phba, mboxq, LPFC_SET_ENABLE_MI);