Commit d99af587 authored by Justin Tee's avatar Justin Tee Committed by Martin K. Petersen
Browse files

scsi: lpfc: Fix MI capability display in cmf_info sysfs attribute 



The dynamic mi_ver value holds the currently configured MI setting.  mi_ver
was being displayed as part of the cmf_info sysfs attribute, when the
output string meant to display MI capabilities instead.

Add a mi_cap member in the lpfc_pc_sli4_params structure that will store MI
capabilities during initialization so that cmf_info prints out capabilities
instead of current configuration.

Signed-off-by: default avatarJustin Tee <justin.tee@broadcom.com>
Link: https://lore.kernel.org/r/20221116011921.105995-4-justintee8345@gmail.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ae696255

drivers/scsi/lpfc/lpfc_attr.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ lpfc_cmf_info_show(struct device *dev, struct device_attribute *attr, 
	scnprintf(tmp, sizeof(tmp),

		  "Congestion Mgmt Info: E2Eattr %d Ver %d "

		  "CMF %d cnt %d\n",

		  phba->sli4_hba.pc_sli4_params.mi_ver,

		  phba->sli4_hba.pc_sli4_params.mi_cap,

		  cp ? cp->cgn_info_version : 0,

		  phba->sli4_hba.pc_sli4_params.cmf, phba->cmf_timer_cnt);

drivers/scsi/lpfc/lpfc_init.c

+3 −0
Original line number Diff line number Diff line
@@ -699,6 +699,8 @@ 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_cap =

		bf_get(cfg_mi_ver, mbx_sli4_parameters);



	/* Are we forcing MI off via module parameter? */

	if (phba->cfg_enable_mi)
@@ -13839,6 +13841,7 @@ lpfc_get_sli4_parameters(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq) 
					   mbx_sli4_parameters);

	phba->sli4_hba.extents_in_use = bf_get(cfg_ext, mbx_sli4_parameters);

	phba->sli4_hba.rpi_hdrs_in_use = bf_get(cfg_hdrr, mbx_sli4_parameters);

	sli4_params->mi_cap = bf_get(cfg_mi_ver, mbx_sli4_parameters);



	/* Check for Extended Pre-Registered SGL support */

	phba->cfg_xpsgl = bf_get(cfg_xpsgl, mbx_sli4_parameters);

drivers/scsi/lpfc/lpfc_sli4.h

+1 −0
Original line number Diff line number Diff line
@@ -556,6 +556,7 @@ struct lpfc_pc_sli4_params { 
#define LPFC_MIB3_SUPPORT	3

	uint16_t mi_value;

#define LPFC_DFLT_MIB_VAL	2

	uint8_t mi_cap;

	uint8_t mib_bde_cnt;

	uint8_t cmf;

	uint8_t cqv;