Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73d91e50 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[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: default avatarAlex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 8d6f5cea

drivers/scsi/lpfc/lpfc_attr.c

+18 −7
Original line number Diff line number Diff line
@@ -749,9 +749,11 @@ lpfc_issue_reset(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;



	int status = -EINVAL;



	if (!phba->cfg_enable_hba_reset)

		return -EACCES;



	if (strncmp(buf, "selective", sizeof("selective") - 1) == 0)

		status = phba->lpfc_selective_reset(phba);
@@ -772,7 +774,7 @@ lpfc_issue_reset(struct device *dev, struct device_attribute *attr, 
 * Returns:

 * zero for success

 **/

static int

int

lpfc_sli4_pdev_status_reg_wait(struct lpfc_hba *phba)

{

	struct lpfc_register portstat_reg = {0};
@@ -4494,9 +4496,10 @@ lpfc_get_host_fabric_name (struct Scsi_Host *shost) 


	spin_lock_irq(shost->host_lock);



	if ((vport->fc_flag & FC_FABRIC) ||

	if ((vport->port_state > LPFC_FLOGI) &&

	    ((vport->fc_flag & FC_FABRIC) ||

	     ((phba->fc_topology == LPFC_TOPOLOGY_LOOP) &&

	     (vport->fc_flag & FC_PUBLIC_LOOP)))

	      (vport->fc_flag & FC_PUBLIC_LOOP))))

		node_name = wwn_to_u64(phba->fc_fabparam.nodeName.u.wwn);

	else

		/* fabric is local port if there is no F/FL_Port */
@@ -4569,9 +4572,17 @@ lpfc_get_stats(struct Scsi_Host *shost) 
	memset(hs, 0, sizeof (struct fc_host_statistics));



	hs->tx_frames = pmb->un.varRdStatus.xmitFrameCnt;

	hs->tx_words = (pmb->un.varRdStatus.xmitByteCnt * 256);

	/*

	 * The MBX_READ_STATUS returns tx_k_bytes which has to

	 * converted to words

	 */

	hs->tx_words = (uint64_t)

			((uint64_t)pmb->un.varRdStatus.xmitByteCnt

			* (uint64_t)256);

	hs->rx_frames = pmb->un.varRdStatus.rcvFrameCnt;

	hs->rx_words = (pmb->un.varRdStatus.rcvByteCnt * 256);

	hs->rx_words = (uint64_t)

			((uint64_t)pmb->un.varRdStatus.rcvByteCnt

			 * (uint64_t)256);



	memset(pmboxq, 0, sizeof (LPFC_MBOXQ_t));

	pmb->mbxCommand = MBX_READ_LNK_STAT;

drivers/scsi/lpfc/lpfc_ct.c

+3 −0
Original line number Diff line number Diff line
@@ -1856,6 +1856,9 @@ lpfc_decode_firmware_rev(struct lpfc_hba *phba, char *fwrevision, int flag) 
		case 2:

			c = 'B';

			break;

		case 3:

			c = 'X';

			break;

		default:

			c = 0;

			break;

drivers/scsi/lpfc/lpfc_els.c

+12 −10
Original line number Diff line number Diff line
@@ -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;

	}

drivers/scsi/lpfc/lpfc_hbadisc.c

+4 −1
Original line number Diff line number Diff line
@@ -2646,7 +2646,9 @@ lpfc_init_vfi_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq) 
{

	struct lpfc_vport *vport = mboxq->vport;



	if (mboxq->u.mb.mbxStatus && (mboxq->u.mb.mbxStatus != 0x4002)) {

	/* VFI not supported on interface type 0, just do the flogi */

	if (mboxq->u.mb.mbxStatus && (bf_get(lpfc_sli_intf_if_type,

	    &phba->sli4_hba.sli_intf) != LPFC_SLI_INTF_IF_TYPE_0)) {

		lpfc_printf_vlog(vport, KERN_ERR,

				LOG_MBOX,

				"2891 Init VFI mailbox failed 0x%x\n",
@@ -2655,6 +2657,7 @@ lpfc_init_vfi_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq) 
		lpfc_vport_set_state(vport, FC_VPORT_FAILED);

		return;

	}



	lpfc_initial_flogi(vport);

	mempool_free(mboxq, phba->mbox_mem_pool);

	return;

drivers/scsi/lpfc/lpfc_hw4.h

+0 −1
Original line number Diff line number Diff line
@@ -680,7 +680,6 @@ struct lpfc_register { 
#define lpfc_rq_doorbell_num_posted_SHIFT	16

#define lpfc_rq_doorbell_num_posted_MASK	0x3FFF

#define lpfc_rq_doorbell_num_posted_WORD	word0

#define LPFC_RQ_POST_BATCH		8	/* RQEs to post at one time */

#define lpfc_rq_doorbell_id_SHIFT		0

#define lpfc_rq_doorbell_id_MASK		0xFFFF

#define lpfc_rq_doorbell_id_WORD		word0