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

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

[SCSI] lpfc 8.2.4 : Miscellaneous Fixes 



Miscellaneous Fixes:
- Fix a couple of sparse complaints
- Reset the FCP recovery flag when the node is not a FCP2 device.
- Speed up offline prep delays
- Fixed a memory leak in lpfc_mem_alloc failure path
- Fixed external loopback test.
- Fixed error code returned from the driver when HBA is over heated.
- Correct Max NPIV vport to limits read from adapter
- Add missing locks around fc_flag and FC_NEEDS_REG_VPI
- Add missing hba ids for device identification
- Added support for SET_VARIABLE and MBX_WRITE_WWN mailbox commands
- Changed all temperature event messages from warning to error
- Fix reporting of link speed when link is down
- Added support for MBX_WRITE_WWN mailbox command
- Change del_timer_sync() in ISR to del_timer() in interrupt handler
- Correct instances of beXX_to_cpu() that should be cpu_to_beXX()
- Perform target flush before releasing node references on module unload
- Avoid bogus devloss_tmo messages when driver unloads
- Fix panic when HBA generates ERATT interupt
- Fix mbox race condition and a workaround on back-to-back mailbox commands
- Force NPIV off for pt2pt mode between 2 NPorts
- Stop worker thread before removing fc_host.
- Fix up discovery timeout error case due to missing clear_la
- Tighten mailbox polling code to speed up detection of fast completions
- Only allow DUMP_MEMORY if adapter offline due to overtemp errors
- Added extended error information to the log messages in chip init.

Signed-off-by: default avatarJames Smart <James.Smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 13815c83

drivers/scsi/lpfc/lpfc.h

+1 −2
Original line number Diff line number Diff line
@@ -559,8 +559,7 @@ struct lpfc_hba { 
	struct list_head port_list;

	struct lpfc_vport *pport;	/* physical lpfc_vport pointer */

	uint16_t max_vpi;		/* Maximum virtual nports */

#define LPFC_MAX_VPI 100		/* Max number of VPI supported */

#define LPFC_MAX_VPORTS (LPFC_MAX_VPI+1)/* Max number of VPorts supported */

#define LPFC_MAX_VPI 0xFFFF		/* Max number of VPI supported */

	unsigned long *vpi_bmask;	/* vpi allocation table */



	/* Data structure used by fabric iocb scheduler */

drivers/scsi/lpfc/lpfc_attr.c

+23 −9
Original line number Diff line number Diff line 
/*******************************************************************

 * This file is part of the Emulex Linux Device Driver for         *

 * Fibre Channel Host Bus Adapters.                                *

 * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *

 * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *

 * EMULEX and SLI are trademarks of Emulex.                        *

 * www.emulex.com                                                  *

 * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -311,12 +311,14 @@ lpfc_do_offline(struct lpfc_hba *phba, uint32_t type) 


	psli = &phba->sli;



	/* Wait a little for things to settle down, but not

	 * long enough for dev loss timeout to expire.

	 */

	for (i = 0; i < psli->num_rings; i++) {

		pring = &psli->ring[i];

		/* The linkdown event takes 30 seconds to timeout. */

		while (pring->txcmplq_cnt) {

			msleep(10);

			if (cnt++ > 3000) {

			if (cnt++ > 500) {  /* 5 secs */

				lpfc_printf_log(phba,

					KERN_WARNING, LOG_INIT,

					"0466 Outstanding IO when "
@@ -989,7 +991,7 @@ lpfc_soft_wwpn_store(struct class_device *cdev, const char *buf, size_t count) 
	spin_lock_irq(&phba->hbalock);

	if (phba->over_temp_state == HBA_OVER_TEMP) {

		spin_unlock_irq(&phba->hbalock);

		return -EPERM;

		return -EACCES;

	}

	spin_unlock_irq(&phba->hbalock);

	/* count may include a LF at end of string */
@@ -1782,7 +1784,7 @@ sysfs_mbox_read(struct kobject *kobj, struct bin_attribute *bin_attr, 
	if (phba->over_temp_state == HBA_OVER_TEMP) {

		sysfs_mbox_idle(phba);

		spin_unlock_irq(&phba->hbalock);

		return  -EPERM;

		return  -EACCES;

	}



	if (off == 0 &&
@@ -1801,9 +1803,7 @@ sysfs_mbox_read(struct kobject *kobj, struct bin_attribute *bin_attr, 
		case MBX_DUMP_CONTEXT:

		case MBX_RUN_DIAGS:

		case MBX_RESTART:

		case MBX_FLASH_WR_ULA:

		case MBX_SET_MASK:

		case MBX_SET_SLIM:

		case MBX_SET_DEBUG:

			if (!(vport->fc_flag & FC_OFFLINE_MODE)) {

				printk(KERN_WARNING "mbox_read:Command 0x%x "
@@ -1831,6 +1831,8 @@ sysfs_mbox_read(struct kobject *kobj, struct bin_attribute *bin_attr, 
		case MBX_LOAD_EXP_ROM:

		case MBX_BEACON:

		case MBX_DEL_LD_ENTRY:

		case MBX_SET_VARIABLE:

		case MBX_WRITE_WWN:

			break;

		case MBX_READ_SPARM64:

		case MBX_READ_LA:
@@ -1852,6 +1854,17 @@ sysfs_mbox_read(struct kobject *kobj, struct bin_attribute *bin_attr, 
			return -EPERM;

		}



		/* If HBA encountered an error attention, allow only DUMP

		 * mailbox command until the HBA is restarted.

		 */

		if ((phba->pport->stopped) &&

			(phba->sysfs_mbox.mbox->mb.mbxCommand

				!= MBX_DUMP_MEMORY)) {

			sysfs_mbox_idle(phba);

			spin_unlock_irq(&phba->hbalock);

			return -EPERM;

		}



		phba->sysfs_mbox.mbox->vport = vport;



		if (phba->sli.sli_flag & LPFC_BLOCK_MGMT_IO) {
@@ -2052,7 +2065,8 @@ lpfc_get_host_speed(struct Scsi_Host *shost) 
				fc_host_speed(shost) = FC_PORTSPEED_UNKNOWN;

			break;

		}

	}

	} else

		fc_host_speed(shost) = FC_PORTSPEED_UNKNOWN;



	spin_unlock_irq(shost->host_lock);

}
@@ -2072,7 +2086,7 @@ lpfc_get_host_fabric_name (struct Scsi_Host *shost) 
		node_name = wwn_to_u64(phba->fc_fabparam.nodeName.u.wwn);

	else

		/* fabric is local port if there is no F/FL_Port */

		node_name = wwn_to_u64(vport->fc_nodename.u.wwn);

		node_name = 0;



	spin_unlock_irq(shost->host_lock);

drivers/scsi/lpfc/lpfc_ct.c

+8 −8
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
 *******************************************************************/



/*

 * Fibre Channel SCSI LAN Device Driver CT support

 * Fibre Channel SCSI LAN Device Driver CT support: FC Generic Services FC-GS

 */



#include <linux/blkdev.h>
@@ -203,7 +203,7 @@ lpfc_alloc_ct_rsp(struct lpfc_hba *phba, int cmdcode, struct ulp_bde64 *bpl, 
	struct lpfc_dmabuf *mp;

	int cnt, i = 0;



	/* We get chucks of FCELSSIZE */

	/* We get chunks of FCELSSIZE */

	cnt = size > FCELSSIZE ? FCELSSIZE: size;



	while (size) {
@@ -1175,7 +1175,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode, 
	case SLI_CTNS_GFF_ID:

		CtReq->CommandResponse.bits.CmdRsp =

			be16_to_cpu(SLI_CTNS_GFF_ID);

		CtReq->un.gff.PortId = be32_to_cpu(context);

		CtReq->un.gff.PortId = cpu_to_be32(context);

		cmpl = lpfc_cmpl_ct_cmd_gff_id;

		break;
@@ -1183,7 +1183,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode, 
		vport->ct_flags &= ~FC_CT_RFT_ID;

		CtReq->CommandResponse.bits.CmdRsp =

		    be16_to_cpu(SLI_CTNS_RFT_ID);

		CtReq->un.rft.PortId = be32_to_cpu(vport->fc_myDID);

		CtReq->un.rft.PortId = cpu_to_be32(vport->fc_myDID);

		CtReq->un.rft.fcpReg = 1;

		cmpl = lpfc_cmpl_ct_cmd_rft_id;

		break;
@@ -1192,7 +1192,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode, 
		vport->ct_flags &= ~FC_CT_RNN_ID;

		CtReq->CommandResponse.bits.CmdRsp =

		    be16_to_cpu(SLI_CTNS_RNN_ID);

		CtReq->un.rnn.PortId = be32_to_cpu(vport->fc_myDID);

		CtReq->un.rnn.PortId = cpu_to_be32(vport->fc_myDID);

		memcpy(CtReq->un.rnn.wwnn,  &vport->fc_nodename,

		       sizeof (struct lpfc_name));

		cmpl = lpfc_cmpl_ct_cmd_rnn_id;
@@ -1202,7 +1202,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode, 
		vport->ct_flags &= ~FC_CT_RSPN_ID;

		CtReq->CommandResponse.bits.CmdRsp =

		    be16_to_cpu(SLI_CTNS_RSPN_ID);

		CtReq->un.rspn.PortId = be32_to_cpu(vport->fc_myDID);

		CtReq->un.rspn.PortId = cpu_to_be32(vport->fc_myDID);

		size = sizeof(CtReq->un.rspn.symbname);

		CtReq->un.rspn.len =

			lpfc_vport_symbolic_port_name(vport,
@@ -1225,14 +1225,14 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode, 
		/* Implement DA_ID Nameserver request */

		CtReq->CommandResponse.bits.CmdRsp =

			be16_to_cpu(SLI_CTNS_DA_ID);

		CtReq->un.da_id.port_id = be32_to_cpu(vport->fc_myDID);

		CtReq->un.da_id.port_id = cpu_to_be32(vport->fc_myDID);

		cmpl = lpfc_cmpl_ct_cmd_da_id;

		break;

	case SLI_CTNS_RFF_ID:

		vport->ct_flags &= ~FC_CT_RFF_ID;

		CtReq->CommandResponse.bits.CmdRsp =

		    be16_to_cpu(SLI_CTNS_RFF_ID);

		CtReq->un.rff.PortId = be32_to_cpu(vport->fc_myDID);;

		CtReq->un.rff.PortId = cpu_to_be32(vport->fc_myDID);;

		CtReq->un.rff.fbits = FC4_FEATURE_INIT;

		CtReq->un.rff.type_code = FC_FCP_DATA;

		cmpl = lpfc_cmpl_ct_cmd_rff_id;

drivers/scsi/lpfc/lpfc_els.c

+29 −13
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
 * more details, a copy of which can be found in the file COPYING  *

 * included with this package.                                     *

 *******************************************************************/



/* See Fibre Channel protocol T11 FC-LS for details */

#include <linux/blkdev.h>

#include <linux/pci.h>

#include <linux/interrupt.h>
@@ -392,11 +392,12 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
		}

		if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) {

			lpfc_mbx_unreg_vpi(vport);

			spin_lock_irq(shost->host_lock);

			vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;

			spin_unlock_irq(shost->host_lock);

		}

	}



	ndlp->nlp_sid = irsp->un.ulpWord[4] & Mask_DID;

	lpfc_nlp_set_state(vport, ndlp, NLP_STE_REG_LOGIN_ISSUE);



	if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED &&
@@ -484,6 +485,9 @@ lpfc_cmpl_els_flogi_nport(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
		lpfc_nlp_put(ndlp);

	}



	/* If we are pt2pt with another NPort, force NPIV off! */

	phba->sli3_options &= ~LPFC_SLI3_NPIV_ENABLED;



	spin_lock_irq(shost->host_lock);

	vport->fc_flag |= FC_PT2PT;

	spin_unlock_irq(shost->host_lock);
@@ -2068,7 +2072,7 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
	return 0;

}



int

static int

lpfc_els_free_data(struct lpfc_hba *phba, struct lpfc_dmabuf *buf_ptr1)

{

	struct lpfc_dmabuf *buf_ptr;
@@ -2086,7 +2090,7 @@ lpfc_els_free_data(struct lpfc_hba *phba, struct lpfc_dmabuf *buf_ptr1) 
	return 0;

}



int

static int

lpfc_els_free_bpl(struct lpfc_hba *phba, struct lpfc_dmabuf *buf_ptr)

{

	lpfc_mbuf_free(phba, buf_ptr->virt, buf_ptr->phys);
@@ -2976,10 +2980,10 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
			"RCV RSCN defer:  did:x%x/ste:x%x flg:x%x",

			ndlp->nlp_DID, vport->port_state, ndlp->nlp_flag);



		spin_lock_irq(shost->host_lock);

		vport->fc_flag |= FC_RSCN_DEFERRED;

		if ((rscn_cnt < FC_MAX_HOLD_RSCN) &&

		    !(vport->fc_flag & FC_RSCN_DISCOVERY)) {

			spin_lock_irq(shost->host_lock);

			vport->fc_flag |= FC_RSCN_MODE;

			spin_unlock_irq(shost->host_lock);

			if (rscn_cnt) {
@@ -3008,7 +3012,6 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
					 vport->fc_rscn_id_cnt, vport->fc_flag,

					 vport->port_state);

		} else {

			spin_lock_irq(shost->host_lock);

			vport->fc_flag |= FC_RSCN_DISCOVERY;

			spin_unlock_irq(shost->host_lock);

			/* ReDiscovery RSCN */
@@ -3023,7 +3026,9 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 


		/* send RECOVERY event for ALL nodes that match RSCN payload */

		lpfc_rscn_recovery_check(vport);

		spin_lock_irq(shost->host_lock);

		vport->fc_flag &= ~FC_RSCN_DEFERRED;

		spin_unlock_irq(shost->host_lock);

		return 0;

	}
@@ -3307,13 +3312,13 @@ lpfc_els_rsp_rps_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
		status |= 0x4;



	rps_rsp->rsvd1 = 0;

	rps_rsp->portStatus = be16_to_cpu(status);

	rps_rsp->linkFailureCnt = be32_to_cpu(mb->un.varRdLnk.linkFailureCnt);

	rps_rsp->lossSyncCnt = be32_to_cpu(mb->un.varRdLnk.lossSyncCnt);

	rps_rsp->lossSignalCnt = be32_to_cpu(mb->un.varRdLnk.lossSignalCnt);

	rps_rsp->primSeqErrCnt = be32_to_cpu(mb->un.varRdLnk.primSeqErrCnt);

	rps_rsp->invalidXmitWord = be32_to_cpu(mb->un.varRdLnk.invalidXmitWord);

	rps_rsp->crcCnt = be32_to_cpu(mb->un.varRdLnk.crcCnt);

	rps_rsp->portStatus = cpu_to_be16(status);

	rps_rsp->linkFailureCnt = cpu_to_be32(mb->un.varRdLnk.linkFailureCnt);

	rps_rsp->lossSyncCnt = cpu_to_be32(mb->un.varRdLnk.lossSyncCnt);

	rps_rsp->lossSignalCnt = cpu_to_be32(mb->un.varRdLnk.lossSignalCnt);

	rps_rsp->primSeqErrCnt = cpu_to_be32(mb->un.varRdLnk.primSeqErrCnt);

	rps_rsp->invalidXmitWord = cpu_to_be32(mb->un.varRdLnk.invalidXmitWord);

	rps_rsp->crcCnt = cpu_to_be32(mb->un.varRdLnk.crcCnt);

	/* Xmit ELS RPS ACC response tag <ulpIoTag> */

	lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_ELS,

			 "0118 Xmit ELS RPS ACC response tag x%x xri x%x, "
@@ -4276,7 +4281,9 @@ lpfc_cmpl_reg_new_vport(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
	struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *) pmb->context2;

	MAILBOX_t *mb = &pmb->mb;



	spin_lock_irq(shost->host_lock);

	vport->fc_flag &= ~FC_VPORT_NEEDS_REG_VPI;

	spin_unlock_irq(shost->host_lock);

	lpfc_nlp_put(ndlp);



	if (mb->mbxStatus) {
@@ -4297,7 +4304,9 @@ lpfc_cmpl_reg_new_vport(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
		default:

			/* Try to recover from this error */

			lpfc_mbx_unreg_vpi(vport);

			spin_lock_irq(shost->host_lock);

			vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;

			spin_unlock_irq(shost->host_lock);

			lpfc_initial_fdisc(vport);

			break;

		}
@@ -4316,6 +4325,7 @@ static void 
lpfc_register_new_vport(struct lpfc_hba *phba, struct lpfc_vport *vport,

			struct lpfc_nodelist *ndlp)

{

	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);

	LPFC_MBOXQ_t *mbox;



	mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
@@ -4327,7 +4337,9 @@ lpfc_register_new_vport(struct lpfc_hba *phba, struct lpfc_vport *vport, 
		if (lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT)

		    == MBX_NOT_FINISHED) {

			mempool_free(mbox, phba->mbox_mem_pool);

			spin_lock_irq(shost->host_lock);

			vport->fc_flag &= ~FC_VPORT_NEEDS_REG_VPI;

			spin_unlock_irq(shost->host_lock);



			lpfc_vport_set_state(vport, FC_VPORT_FAILED);

			lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX,
@@ -4339,7 +4351,9 @@ lpfc_register_new_vport(struct lpfc_hba *phba, struct lpfc_vport *vport, 
		lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX,

				 "0254 Register VPI: no memory\n");



		spin_lock_irq(shost->host_lock);

		vport->fc_flag &= ~FC_VPORT_NEEDS_REG_VPI;

		spin_unlock_irq(shost->host_lock);

		lpfc_nlp_put(ndlp);

	}

}
@@ -4412,7 +4426,9 @@ lpfc_cmpl_els_fdisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
				lpfc_unreg_rpi(vport, np);

			}

			lpfc_mbx_unreg_vpi(vport);

			spin_lock_irq(shost->host_lock);

			vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;

			spin_unlock_irq(shost->host_lock);

		}



		if (vport->fc_flag & FC_VPORT_NEEDS_REG_VPI)

drivers/scsi/lpfc/lpfc_hbadisc.c

+26 −20
Original line number Diff line number Diff line
@@ -114,15 +114,8 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport) 


	rdata = rport->dd_data;

	ndlp = rdata->pnode;



	if (!ndlp) {

		if (rport->scsi_target_id != -1) {

			printk(KERN_ERR "Cannot find remote node"

				" for rport in dev_loss_tmo_callbk x%x\n",

				rport->port_id);

		}

	if (!ndlp)

		return;

	}



	vport = ndlp->vport;

	phba  = vport->phba;
@@ -202,6 +195,12 @@ lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp) 
	 * appropriately we just need to cleanup the ndlp rport info here.

	 */

	if (vport->load_flag & FC_UNLOADING) {

		if (ndlp->nlp_sid != NLP_NO_SID) {

			/* flush the target */

			lpfc_sli_abort_iocb(vport,

					&phba->sli.ring[phba->sli.fcp_ring],

					ndlp->nlp_sid, 0, LPFC_CTX_TGT);

		}

		put_node = rdata->pnode != NULL;

		put_rport = ndlp->rport != NULL;

		rdata->pnode = NULL;
@@ -381,7 +380,7 @@ lpfc_work_done(struct lpfc_hba *phba) 
		lpfc_handle_latt(phba);

	vports = lpfc_create_vport_work_array(phba);

	if (vports != NULL)

		for(i = 0; i < LPFC_MAX_VPORTS; i++) {

		for(i = 0; i <= phba->max_vpi; i++) {

			/*

			 * We could have no vports in array if unloading, so if

			 * this happens then just use the pport
@@ -413,7 +412,7 @@ lpfc_work_done(struct lpfc_hba *phba) 
			vport->work_port_events &= ~work_port_events;

			spin_unlock_irq(&vport->work_port_lock);

		}

	lpfc_destroy_vport_work_array(vports);

	lpfc_destroy_vport_work_array(phba, vports);



	pring = &phba->sli.ring[LPFC_ELS_RING];

	status = (ha_copy & (HA_RXMASK  << (4*LPFC_ELS_RING)));
@@ -552,6 +551,7 @@ lpfc_workq_post_event(struct lpfc_hba *phba, void *arg1, void *arg2, 
void

lpfc_cleanup_rpis(struct lpfc_vport *vport, int remove)

{

	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);

	struct lpfc_hba  *phba = vport->phba;

	struct lpfc_nodelist *ndlp, *next_ndlp;

	int  rc;
@@ -575,7 +575,9 @@ lpfc_cleanup_rpis(struct lpfc_vport *vport, int remove) 
	}

	if (phba->sli3_options & LPFC_SLI3_VPORT_TEARDOWN) {

		lpfc_mbx_unreg_vpi(vport);

		spin_lock_irq(shost->host_lock);

		vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;

		spin_unlock_irq(shost->host_lock);

	}

}
@@ -629,11 +631,11 @@ lpfc_linkdown(struct lpfc_hba *phba) 
	spin_unlock_irq(&phba->hbalock);

	vports = lpfc_create_vport_work_array(phba);

	if (vports != NULL)

		for(i = 0; i < LPFC_MAX_VPORTS && vports[i] != NULL; i++) {

		for(i = 0; i <= phba->max_vpi && vports[i] != NULL; i++) {

			/* Issue a LINK DOWN event to all nodes */

			lpfc_linkdown_port(vports[i]);

		}

	lpfc_destroy_vport_work_array(vports);

	lpfc_destroy_vport_work_array(phba, vports);

	/* Clean up any firmware default rpi's */

	mb = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);

	if (mb) {
@@ -738,9 +740,9 @@ lpfc_linkup(struct lpfc_hba *phba) 


	vports = lpfc_create_vport_work_array(phba);

	if (vports != NULL)

		for(i = 0; i < LPFC_MAX_VPORTS && vports[i] != NULL; i++)

		for(i = 0; i <= phba->max_vpi && vports[i] != NULL; i++)

			lpfc_linkup_port(vports[i]);

	lpfc_destroy_vport_work_array(vports);

	lpfc_destroy_vport_work_array(phba, vports);

	if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED)

		lpfc_issue_clear_la(phba, phba->pport);
@@ -1319,7 +1321,7 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
		vports = lpfc_create_vport_work_array(phba);

		if (vports != NULL)

			for(i = 0;

			    i < LPFC_MAX_VPORTS && vports[i] != NULL;

			    i <= phba->max_vpi && vports[i] != NULL;

			    i++) {

				if (vports[i]->port_type == LPFC_PHYSICAL_PORT)

					continue;
@@ -1335,7 +1337,7 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
							"Fabric support\n");

				}

			}

		lpfc_destroy_vport_work_array(vports);

		lpfc_destroy_vport_work_array(phba, vports);

		lpfc_do_scr_ns_plogi(phba, vport);

	}
@@ -1902,7 +1904,8 @@ lpfc_unreg_all_rpis(struct lpfc_vport *vport) 
		lpfc_unreg_login(phba, vport->vpi, 0xffff, mbox);

		mbox->vport = vport;

		mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl;

		rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT);

		mbox->context1 = NULL;

		rc = lpfc_sli_issue_mbox_wait(phba, mbox, LPFC_MBOX_TMO);

		if (rc == MBX_NOT_FINISHED) {

			mempool_free(mbox, phba->mbox_mem_pool);

		}
@@ -1921,7 +1924,8 @@ lpfc_unreg_default_rpis(struct lpfc_vport *vport) 
		lpfc_unreg_did(phba, vport->vpi, 0xffffffff, mbox);

		mbox->vport = vport;

		mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl;

		rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT);

		mbox->context1 = NULL;

		rc = lpfc_sli_issue_mbox_wait(phba, mbox, LPFC_MBOX_TMO);

		if (rc == MBX_NOT_FINISHED) {

			lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX | LOG_VPORT,

					 "1815 Could not issue "
@@ -2026,7 +2030,7 @@ lpfc_nlp_remove(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) 
				mbox->mbox_flag |= LPFC_MBX_IMED_UNREG;

				mbox->mbox_cmpl = lpfc_mbx_cmpl_dflt_rpi;

				mbox->vport = vport;

				mbox->context2 = 0;

				mbox->context2 = NULL;

				rc =lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT);

				if (rc == MBX_NOT_FINISHED) {

					mempool_free(mbox, phba->mbox_mem_pool);
@@ -2702,12 +2706,14 @@ lpfc_disc_timeout_handler(struct lpfc_vport *vport) 
		clrlaerr = 1;

		break;



	case LPFC_LINK_UP:

		lpfc_issue_clear_la(phba, vport);

		/* Drop thru */

	case LPFC_LINK_UNKNOWN:

	case LPFC_WARM_START:

	case LPFC_INIT_START:

	case LPFC_INIT_MBX_CMDS:

	case LPFC_LINK_DOWN:

	case LPFC_LINK_UP:

	case LPFC_HBA_ERROR:

		lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,

				 "0230 Unexpected timeout, hba link "