scsi: lpfc: Fix missing FDMI registrations after Mgmt Svc login

FDMI registration needs to be performed after every login with the FC Mgmt
service. The flag the driver is using to track registration is cleared on
link up, but never on Mgmt service logout/re-login.

Fix by clearing the flag whenever a new login is completed with the FC Mgmt
service.

While perusing the flag use, logging was performed as if FDMI registration
occurred on vports. However, it is limited to the physical port only.
Revise the logging to reflect physical port based.

Link: https://lore.kernel.org/r/20210412013127.2387-10-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>

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 37b0c202499889b1a356c125dad7b62167efe512..8da9e18a1fde1ef7129ee81730ab4b50fb30dab7 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -2253,12 +2253,12 @@ lpfc_cmpl_ct_disc_fdmi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                        return;
 
                case SLI_MGMT_RPA:
-                       /* No retry on Vendor RPA */
+                       /* No retry on Vendor, RPA only done on physical port */
                        if (phba->link_flag & LS_CT_VEN_RPA) {
-                               lpfc_printf_vlog(vport, KERN_ERR,
-                                                LOG_DISCOVERY | LOG_ELS,
-                                                "6460 VEN FDMI RPA failure\n");
                                phba->link_flag &= ~LS_CT_VEN_RPA;
+                               lpfc_printf_log(phba, KERN_ERR,
+                                               LOG_DISCOVERY | LOG_ELS,
+                                               "6460 VEN FDMI RPA failure\n");
                                return;
                        }
                        if (vport->fdmi_port_mask == LPFC_FDMI2_PORT_ATTR) {
@@ -2306,23 +2306,24 @@ lpfc_cmpl_ct_disc_fdmi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                        if (phba->link_flag & LS_CT_VEN_RPA) {
                                lpfc_printf_vlog(vport, KERN_INFO,
                                                 LOG_DISCOVERY | LOG_ELS,
-                                                "6449 VEN RPA Success\n");
+                                                "6449 VEN RPA FDMI Success\n");
+                               phba->link_flag &= ~LS_CT_VEN_RPA;
                                break;
                        }
 
                        if (lpfc_fdmi_cmd(vport, ndlp, cmd,
                                          LPFC_FDMI_VENDOR_ATTR_mi) == 0)
                                phba->link_flag |= LS_CT_VEN_RPA;
-                       lpfc_printf_vlog(vport, KERN_INFO,
+                       lpfc_printf_log(phba, KERN_INFO,
                                        LOG_DISCOVERY | LOG_ELS,
                                        "6458 Send MI FDMI:%x Flag x%x\n",
                                        phba->sli4_hba.pc_sli4_params.mi_value,
                                        phba->link_flag);
                } else {
-                       lpfc_printf_vlog(vport, KERN_INFO,
-                                        LOG_DISCOVERY | LOG_ELS,
-                                        "6459 No FDMI VEN MI support - "
-                                        "RPA Success\n");
+                       lpfc_printf_log(phba, KERN_INFO,
+                                       LOG_DISCOVERY | LOG_ELS,
+                                       "6459 No FDMI VEN MI support - "
+                                       "RPA Success\n");
                }
                break;
        }
@@ -2369,10 +2370,13 @@ lpfc_fdmi_change_check(struct lpfc_vport *vport)
                 * DHBA -> DPRT -> RHBA -> RPA  (physical port)
                 * DPRT -> RPRT (vports)
                 */
-               if (vport->port_type == LPFC_PHYSICAL_PORT)
+               if (vport->port_type == LPFC_PHYSICAL_PORT) {
+                       /* For extra Vendor RPA */
+                       phba->link_flag &= ~LS_CT_VEN_RPA;
                        lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_DHBA, 0);
-               else
+               } else {
                        lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_DPRT, 0);
+               }
 
                /* Since this code path registers all the port attributes
                 * we can just return without further checking.

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 85633eb7524fb6ddbbf151d0783e4dd21e8d3620..03977a2268fecb5b0496ba0689e0e785c8ad9235 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -5952,10 +5952,12 @@ lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
         * DHBA -> DPRT -> RHBA -> RPA  (physical port)
         * DPRT -> RPRT (vports)
         */
-       if (vport->port_type == LPFC_PHYSICAL_PORT)
+       if (vport->port_type == LPFC_PHYSICAL_PORT) {
+               phba->link_flag &= ~LS_CT_VEN_RPA; /* For extra Vendor RPA */
                lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_DHBA, 0);
-       else
+       } else {
                lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_DPRT, 0);
+       }
 
 
        /* decrement the node reference count held for this callback