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

scsi: lpfc: Clean up SLI-4 sysfs resource reporting 



Currently, we have dated logic to work around the differences between SLI-4
and SLI-3 resource reporting through sysfs.

Leave the SLI-3 path untouched, but for SLI4 path, retrieve resource values
from the phba->sli4_hba->max_cfg_param structure.  Max values are populated
during ACQE events right after READ_CONFIG mbox cmd is sent.  Instead of
the dated subtraction logic, used resource calculation is directly fed into
sysfs for display.

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


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

drivers/scsi/lpfc/lpfc_attr.c

+101 −35
Original line number Diff line number Diff line
@@ -2127,11 +2127,12 @@ lpfc_get_hba_info(struct lpfc_hba *phba, 
		  uint32_t *mrpi, uint32_t *arpi,

		  uint32_t *mvpi, uint32_t *avpi)

{

	struct lpfc_mbx_read_config *rd_config;

	LPFC_MBOXQ_t *pmboxq;

	MAILBOX_t *pmb;

	int rc = 0;

	uint32_t max_vpi;

	struct lpfc_sli4_hba *sli4_hba;

	struct lpfc_max_cfg_param *max_cfg_param;

	u16 rsrc_ext_cnt, rsrc_ext_size, max_vpi;



	/*

	 * prevent udev from issuing mailbox commands until the port is
@@ -2167,31 +2168,65 @@ lpfc_get_hba_info(struct lpfc_hba *phba, 
	}



	if (phba->sli_rev == LPFC_SLI_REV4) {

		rd_config = &pmboxq->u.mqe.un.rd_config;

		sli4_hba = &phba->sli4_hba;

		max_cfg_param = &sli4_hba->max_cfg_param;



		/* Normally, extents are not used */

		if (!phba->sli4_hba.extents_in_use) {

			if (mrpi)

			*mrpi = bf_get(lpfc_mbx_rd_conf_rpi_count, rd_config);

		if (arpi)

			*arpi = bf_get(lpfc_mbx_rd_conf_rpi_count, rd_config) -

					phba->sli4_hba.max_cfg_param.rpi_used;

				*mrpi = max_cfg_param->max_rpi;

			if (mxri)

			*mxri = bf_get(lpfc_mbx_rd_conf_xri_count, rd_config);

		if (axri)

			*axri = bf_get(lpfc_mbx_rd_conf_xri_count, rd_config) -

					phba->sli4_hba.max_cfg_param.xri_used;

				*mxri = max_cfg_param->max_xri;

			if (mvpi) {

				max_vpi = max_cfg_param->max_vpi;



		/* Account for differences with SLI-3.  Get vpi count from

		 * mailbox data and subtract one for max vpi value.

		 */

		max_vpi = (bf_get(lpfc_mbx_rd_conf_vpi_count, rd_config) > 0) ?

			(bf_get(lpfc_mbx_rd_conf_vpi_count, rd_config) - 1) : 0;

				/* Limit the max we support */

				if (max_vpi > LPFC_MAX_VPI)

					max_vpi = LPFC_MAX_VPI;

				*mvpi = max_vpi;

			}

		} else { /* Extents in use */

			if (mrpi) {

				if (lpfc_sli4_get_avail_extnt_rsrc(phba,

								   LPFC_RSC_TYPE_FCOE_RPI,

								   &rsrc_ext_cnt,

								   &rsrc_ext_size)) {

					rc = 0;

					goto free_pmboxq;

				}



				*mrpi = rsrc_ext_cnt * rsrc_ext_size;

			}



			if (mxri) {

				if (lpfc_sli4_get_avail_extnt_rsrc(phba,

								   LPFC_RSC_TYPE_FCOE_XRI,

								   &rsrc_ext_cnt,

								   &rsrc_ext_size)) {

					rc = 0;

					goto free_pmboxq;

				}



				*mxri = rsrc_ext_cnt * rsrc_ext_size;

			}



			if (mvpi) {

				if (lpfc_sli4_get_avail_extnt_rsrc(phba,

								   LPFC_RSC_TYPE_FCOE_VPI,

								   &rsrc_ext_cnt,

								   &rsrc_ext_size)) {

					rc = 0;

					goto free_pmboxq;

				}



				max_vpi = rsrc_ext_cnt * rsrc_ext_size;



				/* Limit the max we support */

				if (max_vpi > LPFC_MAX_VPI)

					max_vpi = LPFC_MAX_VPI;

		if (mvpi)

				*mvpi = max_vpi;

		if (avpi)

			*avpi = max_vpi - phba->sli4_hba.max_cfg_param.vpi_used;

			}

		}

	} else {

		if (mrpi)

			*mrpi = pmb->un.varRdConfig.max_rpi;
@@ -2212,8 +2247,12 @@ lpfc_get_hba_info(struct lpfc_hba *phba, 
		}

	}



	/* Success */

	rc = 1;



free_pmboxq:

	mempool_free(pmboxq, phba->mbox_mem_pool);

	return 1;

	return rc;

}



/**
@@ -2265,10 +2304,19 @@ lpfc_used_rpi_show(struct device *dev, struct device_attribute *attr, 
	struct Scsi_Host  *shost = class_to_shost(dev);

	struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;

	struct lpfc_hba   *phba = vport->phba;

	uint32_t cnt, acnt;

	struct lpfc_sli4_hba *sli4_hba;

	struct lpfc_max_cfg_param *max_cfg_param;

	u32 cnt = 0, acnt = 0;



	if (phba->sli_rev == LPFC_SLI_REV4) {

		sli4_hba = &phba->sli4_hba;

		max_cfg_param = &sli4_hba->max_cfg_param;

		return scnprintf(buf, PAGE_SIZE, "%d\n",

				 max_cfg_param->rpi_used);

	} else {

		if (lpfc_get_hba_info(phba, NULL, NULL, &cnt, &acnt, NULL, NULL))

			return scnprintf(buf, PAGE_SIZE, "%d\n", (cnt - acnt));

	}

	return scnprintf(buf, PAGE_SIZE, "Unknown\n");

}
@@ -2321,10 +2369,19 @@ lpfc_used_xri_show(struct device *dev, struct device_attribute *attr, 
	struct Scsi_Host  *shost = class_to_shost(dev);

	struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;

	struct lpfc_hba   *phba = vport->phba;

	uint32_t cnt, acnt;

	struct lpfc_sli4_hba *sli4_hba;

	struct lpfc_max_cfg_param *max_cfg_param;

	u32 cnt = 0, acnt = 0;



	if (phba->sli_rev == LPFC_SLI_REV4) {

		sli4_hba = &phba->sli4_hba;

		max_cfg_param = &sli4_hba->max_cfg_param;

		return scnprintf(buf, PAGE_SIZE, "%d\n",

				 max_cfg_param->xri_used);

	} else {

		if (lpfc_get_hba_info(phba, &cnt, &acnt, NULL, NULL, NULL, NULL))

			return scnprintf(buf, PAGE_SIZE, "%d\n", (cnt - acnt));

	}

	return scnprintf(buf, PAGE_SIZE, "Unknown\n");

}
@@ -2377,10 +2434,19 @@ lpfc_used_vpi_show(struct device *dev, struct device_attribute *attr, 
	struct Scsi_Host  *shost = class_to_shost(dev);

	struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;

	struct lpfc_hba   *phba = vport->phba;

	uint32_t cnt, acnt;

	struct lpfc_sli4_hba *sli4_hba;

	struct lpfc_max_cfg_param *max_cfg_param;

	u32 cnt = 0, acnt = 0;



	if (phba->sli_rev == LPFC_SLI_REV4) {

		sli4_hba = &phba->sli4_hba;

		max_cfg_param = &sli4_hba->max_cfg_param;

		return scnprintf(buf, PAGE_SIZE, "%d\n",

				 max_cfg_param->vpi_used);

	} else {

		if (lpfc_get_hba_info(phba, NULL, NULL, NULL, NULL, &cnt, &acnt))

			return scnprintf(buf, PAGE_SIZE, "%d\n", (cnt - acnt));

	}

	return scnprintf(buf, PAGE_SIZE, "Unknown\n");

}