[SCSI] lpfc 8.3.27: Miscellanous logic and interface fixes

Miscellanous logic and interface fixes

- Fix lpfc_init_vfi_cmpl to check the interface type for interface type 0
  before parsing the results.
- Cast uint32_t values that are multiplied to uint64_t before the
  multiplication.
- Instead of "break" statement when PCI read returned error, use the goto
  statement to the end of the routine after setting return value
- moved the msleep(10) to the beginning of the wait loop for checking the
  SLIPort_Status register
- Added the code to follow the existing wait for SLIPort_Status register RDY,
  ERR, and RN bits to be set by the port before proceeding to perform PCI
  function reset.
- Do not override ulpCt_h and ulpCt_l for SLI 4 ports.
- For vport delete, call lpfc_nlp_put when the vport's vpi state is not
  marked with VPI_REGISTERED.
- Added missed fields into the driver's Controller Attributes Structure
- Changed ringing EQ/CQ/RQ doorbell register to be dependent on the size
  of the queue.
- Return -EACCES in issue_reset if cfg_enable_hba_reset is zero.
- Added new logging flag LOG_FCP_UNDER 0x00040000 to qualify underrun logging.
- Add a check in the fabric name display routine to display 0 if the port
  state is <= FLOGI.
- Add a check to the switch statement in lpfc_decode_firmware_rev to check
  for an 'X'.

Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 12 insertions, 10 deletions

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 727c793422f2..445826a4c981 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -3386,7 +3386,14 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                         cmdiocb->context1 = NULL;
                 }
         }
+
+        /*
+         * The driver received a LOGO from the rport and has ACK'd it.
+         * At this point, the driver is done so release the IOCB and
+         * remove the ndlp reference.
+         */
         lpfc_els_free_iocb(phba, cmdiocb);
+        lpfc_nlp_put(ndlp);
         return;
 }
 
@@ -7257,16 +7264,11 @@ lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
         icmd->un.elsreq64.myID = 0;
         icmd->un.elsreq64.fl = 1;
 
-        if  ((phba->sli_rev == LPFC_SLI_REV4) &&
-             (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) ==
-              LPFC_SLI_INTF_IF_TYPE_0)) {
-                /* FDISC needs to be 1 for WQE VPI */
-                elsiocb->iocb.ulpCt_h = (SLI4_CT_VPI >> 1) & 1;
-                elsiocb->iocb.ulpCt_l = SLI4_CT_VPI & 1 ;
-                /* Set the ulpContext to the vpi */
-                elsiocb->iocb.ulpContext = phba->vpi_ids[vport->vpi];
-        } else {
-                /* For FDISC, Let FDISC rsp set the NPortID for this VPI */
+        /*
+         * SLI3 ports require a different context type value than SLI4.
+         * Catch SLI3 ports here and override the prep.
+         */
+        if (phba->sli_rev == LPFC_SLI_REV3) {
                 icmd->ulpCt_h = 1;
                 icmd->ulpCt_l = 0;
         }