Commit 8b47ae69 authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Cap NPIV vports to 256 



Depending on the chipset, the number of NPIV vports may vary and be in
excess of what most switches support (256). To avoid confusion with the
users, limit the reported NPIV vports to 256.

Additionally correct the 16G adapter which is reporting a bogus NPIV vport
number if the link is down.

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 5a9eeff5

drivers/scsi/lpfc/lpfc.h

+2 −1
Original line number Diff line number Diff line
@@ -1004,7 +1004,8 @@ struct lpfc_hba { 
	spinlock_t port_list_lock;	/* lock for port_list mutations */

	struct lpfc_vport *pport;	/* physical lpfc_vport pointer */

	uint16_t max_vpi;		/* Maximum virtual nports */

#define LPFC_MAX_VPI 0xFFFF		/* Max number of VPI supported */

#define LPFC_MAX_VPI	0xFF		/* Max number VPI supported 0 - 0xff */

#define LPFC_MAX_VPORTS	0x100		/* Max vports per port, with pport */

	uint16_t max_vports;            /*

					 * For IOV HBAs max_vpi can change

					 * after a reset. max_vports is max

drivers/scsi/lpfc/lpfc_attr.c

+10 −2
Original line number Diff line number Diff line
@@ -1720,6 +1720,9 @@ lpfc_get_hba_info(struct lpfc_hba *phba, 
		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;

		if (mvpi)

			*mvpi = max_vpi;

		if (avpi)
@@ -1735,8 +1738,13 @@ lpfc_get_hba_info(struct lpfc_hba *phba, 
			*axri = pmb->un.varRdConfig.avail_xri;

		if (mvpi)

			*mvpi = pmb->un.varRdConfig.max_vpi;

		if (avpi)

		if (avpi) {

			/* avail_vpi is only valid if link is up and ready */

			if (phba->link_state == LPFC_HBA_READY)

				*avpi = pmb->un.varRdConfig.avail_vpi;

			else

				*avpi = pmb->un.varRdConfig.max_vpi;

		}

	}



	mempool_free(pmboxq, phba->mbox_mem_pool);

drivers/scsi/lpfc/lpfc_init.c

+3 −0
Original line number Diff line number Diff line
@@ -7958,6 +7958,9 @@ lpfc_sli4_read_config(struct lpfc_hba *phba) 
			bf_get(lpfc_mbx_rd_conf_xri_base, rd_config);

		phba->sli4_hba.max_cfg_param.max_vpi =

			bf_get(lpfc_mbx_rd_conf_vpi_count, rd_config);

		/* Limit the max we support */

		if (phba->sli4_hba.max_cfg_param.max_vpi > LPFC_MAX_VPORTS)

			phba->sli4_hba.max_cfg_param.max_vpi = LPFC_MAX_VPORTS;

		phba->sli4_hba.max_cfg_param.vpi_base =

			bf_get(lpfc_mbx_rd_conf_vpi_base, rd_config);

		phba->sli4_hba.max_cfg_param.max_rpi =

CRA Git | Maintained and supported by SUSTech CRA and CCSE