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: Dick Kennedy <dick.kennedy@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.h b/drivers/scsi/lpfc/lpfc.h
index b37e0caf078144d85528e903ea096e1f1963592d..35dcd6958fd007a79e9cb9beaa010537b2c07204 100644 (file)
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -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

diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 5f30e40bcc0ada1b124be9a2cceb551b6608e528..feaaa015150e0bf74e8a94f93c3a70df58232586 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -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)
-                       *avpi = pmb->un.varRdConfig.avail_vpi;
+               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);

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 647a037d6f4db397e1d29431ee0a323e529cb6bf..716add289397472d47145f3a488bf7c0342ac7da 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -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 =