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

Commit 0558056c authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.24: Miscellaneous Fixes and Corrections 



Miscellaneous Fixes and Corrections
- Remove the memset in the lpfc_sli4_remove_rpi_hdrs call.
- Correct swapping of SGE word 2 relative to offset value
- Reorganize CQ and EQ usage to comply with SLI4 Specification.
- Expand the driver to check the rn bit. Only detect an error if the error bit
  is set and the RN bit is NOT set.
- If mailbox completion code is not success AND the mailbox status is success,
  then and only then will the driver overwrite the mailbox status.
- When driver initializing device, if the device is on a PCIe bus, set
  PCI's "needs fundamental reset" bit so that EEH uses fundamental reset
  instead of hot reset for recovery.
- Prevent driver from using new WWN when changed in firmware (until driver
  reload)
- When HBA reports maximum SGE size > 0xffffffff (infinite), override
  with 0x80000000.
- Fixed potential missed SLI4 device initialization failure conditions.
- Added 100ms delay before driver action following IF_TYPE_2 function reset.
- Reverted patch to UNREG/REG on PLOGI to mapped/unmapped node.
- Add a check for the CVL received flag in the fcf inuse routine to avoid
  unregistering the fcf if Devloss fires before Delay discover timer fires.

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 1ca1e43e

drivers/scsi/lpfc/lpfc.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ struct lpfc_sli2_slim; 
		downloads using bsg */

#define LPFC_DEFAULT_PROT_SG_SEG_CNT 4096 /* sg protection elements count */

#define LPFC_MAX_SG_SEG_CNT	4096	/* sg element count per scsi cmnd */

#define LPFC_MAX_SGE_SIZE       0x80000000 /* Maximum data allowed in a SGE */

#define LPFC_MAX_PROT_SG_SEG_CNT 4096	/* prot sg element count per scsi cmd*/

#define LPFC_IOCB_LIST_CNT	2250	/* list of IOCBs for fast-path usage. */

#define LPFC_Q_RAMP_UP_INTERVAL 120     /* lun q_depth ramp up interval */

drivers/scsi/lpfc/lpfc_crtn.h

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ void lpfc_delayed_disc_tmo(unsigned long); 
void lpfc_delayed_disc_timeout_handler(struct lpfc_vport *);



int lpfc_config_port_prep(struct lpfc_hba *);

void lpfc_update_vport_wwn(struct lpfc_vport *vport);

int lpfc_config_port_post(struct lpfc_hba *);

int lpfc_hba_down_prep(struct lpfc_hba *);

int lpfc_hba_down_post(struct lpfc_hba *);

drivers/scsi/lpfc/lpfc_debugfs.c

+6 −4
Original line number Diff line number Diff line
@@ -1665,7 +1665,8 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes, 
	/* Get fast-path complete queue information */

	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,

			"Fast-path FCP CQ information:\n");

	for (fcp_qidx = 0; fcp_qidx < phba->cfg_fcp_eq_count; fcp_qidx++) {

	fcp_qidx = 0;

	do {

		len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len,

				"Associated EQID[%02d]:\n",

				phba->sli4_hba.fcp_cq[fcp_qidx]->assoc_qid);
@@ -1678,7 +1679,7 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes, 
				phba->sli4_hba.fcp_cq[fcp_qidx]->entry_size,

				phba->sli4_hba.fcp_cq[fcp_qidx]->host_index,

				phba->sli4_hba.fcp_cq[fcp_qidx]->hba_index);

	}

	} while (++fcp_qidx < phba->cfg_fcp_eq_count);

	len += snprintf(pbuffer+len, LPFC_QUE_INFO_GET_BUF_SIZE-len, "\n");



	/* Get mailbox queue information */
@@ -2012,7 +2013,8 @@ lpfc_idiag_queacc_write(struct file *file, const char __user *buf, 
			goto pass_check;

		}

		/* FCP complete queue */

		for (qidx = 0; qidx < phba->cfg_fcp_eq_count; qidx++) {

		qidx = 0;

		do {

			if (phba->sli4_hba.fcp_cq[qidx]->queue_id == queid) {

				/* Sanity check */

				rc = lpfc_idiag_que_param_check(
@@ -2024,7 +2026,7 @@ lpfc_idiag_queacc_write(struct file *file, const char __user *buf, 
						phba->sli4_hba.fcp_cq[qidx];

				goto pass_check;

			}

		}

		} while (++qidx < phba->cfg_fcp_eq_count);

		goto error_out;

		break;

	case LPFC_IDIAG_MQ:

drivers/scsi/lpfc/lpfc_hbadisc.c

+12 −10
Original line number Diff line number Diff line
@@ -2690,16 +2690,7 @@ lpfc_mbx_cmpl_read_sparam(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 


	memcpy((uint8_t *) &vport->fc_sparam, (uint8_t *) mp->virt,

	       sizeof (struct serv_parm));

	if (phba->cfg_soft_wwnn)

		u64_to_wwn(phba->cfg_soft_wwnn,

			   vport->fc_sparam.nodeName.u.wwn);

	if (phba->cfg_soft_wwpn)

		u64_to_wwn(phba->cfg_soft_wwpn,

			   vport->fc_sparam.portName.u.wwn);

	memcpy(&vport->fc_nodename, &vport->fc_sparam.nodeName,

	       sizeof(vport->fc_nodename));

	memcpy(&vport->fc_portname, &vport->fc_sparam.portName,

	       sizeof(vport->fc_portname));

	lpfc_update_vport_wwn(vport);

	if (vport->port_type == LPFC_PHYSICAL_PORT) {

		memcpy(&phba->wwnn, &vport->fc_nodename, sizeof(phba->wwnn));

		memcpy(&phba->wwpn, &vport->fc_portname, sizeof(phba->wwnn));
@@ -5354,6 +5345,17 @@ lpfc_fcf_inuse(struct lpfc_hba *phba) 
	for (i = 0; i <= phba->max_vports && vports[i] != NULL; i++) {

		shost = lpfc_shost_from_vport(vports[i]);

		spin_lock_irq(shost->host_lock);

		/*

		 * IF the CVL_RCVD bit is not set then we have sent the

		 * flogi.

		 * If dev_loss fires while we are waiting we do not want to

		 * unreg the fcf.

		 */

		if (!(vports[i]->fc_flag & FC_VPORT_CVL_RCVD)) {

			spin_unlock_irq(shost->host_lock);

			ret =  1;

			goto out;

		}

		list_for_each_entry(ndlp, &vports[i]->fc_nodes, nlp_listp) {

			if (NLP_CHK_NODE_ACT(ndlp) && ndlp->rport &&

			  (ndlp->rport->roles & FC_RPORT_ROLE_FCP_TARGET)) {

drivers/scsi/lpfc/lpfc_hw4.h

+1 −1
Original line number Diff line number Diff line
@@ -1229,7 +1229,7 @@ struct sli4_sge { /* SLI-4 */ 


	uint32_t word2;

#define lpfc_sli4_sge_offset_SHIFT	0 /* Offset of buffer - Not used*/

#define lpfc_sli4_sge_offset_MASK	0x00FFFFFF

#define lpfc_sli4_sge_offset_MASK	0x1FFFFFFF

#define lpfc_sli4_sge_offset_WORD	word2

#define lpfc_sli4_sge_last_SHIFT	31 /* Last SEG in the SGL sets

						this  flag !! */