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

[SCSI] lpfc 8.2.6 : Miscellaneous Fixes 



Miscellaneous Fixes
- Allow WRITE_VPARAM command when the virtual port is in a stopped state
- Fixed handling of our queue depth max that was unconditionally raising
  the depth on all vports, rather than just the vport affected.
- Fix race in interrupt handler for mailbox processing that did not take
  out the host lock.
- Removed unused functions: find_node, findnode_rpi, and fabric_abort_flogi
- Correct misspelled word unsolicited in message 0146
- Correct HW-error 5 handling - it should not reset the adapter
- Correct handling of IOCBs, which did not null out our pCmd field before
  invoking the midlayer io done function.
- Changed our maximum supported target id to 4096

Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 9b379605

drivers/scsi/lpfc/lpfc.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


struct lpfc_sli2_slim;



#define LPFC_MAX_TARGET		256	/* max number of targets supported */

#define LPFC_MAX_TARGET		4096	/* max number of targets supported */

#define LPFC_MAX_DISC_THREADS	64	/* max outstanding discovery els

					   requests */

#define LPFC_MAX_NS_RETRY	3	/* Number of retry attempts to contact

drivers/scsi/lpfc/lpfc_attr.c

+3 −1
Original line number Diff line number Diff line
@@ -1954,7 +1954,9 @@ sysfs_mbox_read(struct kobject *kobj, struct bin_attribute *bin_attr, 
			(phba->sysfs_mbox.mbox->mb.mbxCommand !=

				MBX_DUMP_MEMORY &&

			 phba->sysfs_mbox.mbox->mb.mbxCommand !=

				MBX_RESTART)) {

				MBX_RESTART &&

			 phba->sysfs_mbox.mbox->mb.mbxCommand !=

				MBX_WRITE_VPARMS)) {

			sysfs_mbox_idle(phba);

			spin_unlock_irq(&phba->hbalock);

			return -EPERM;

drivers/scsi/lpfc/lpfc_ct.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ lpfc_ct_ignore_hbq_buffer(struct lpfc_hba *phba, struct lpfc_iocbq *piocbq, 
{

	if (!mp) {

		lpfc_printf_log(phba, KERN_INFO, LOG_ELS,

				"0146 Ignoring unsolicted CT No HBQ "

				"0146 Ignoring unsolicited CT No HBQ "

				"status = x%x\n",

				piocbq->iocb.ulpStatus);

	}

drivers/scsi/lpfc/lpfc_els.c

+0 −36
Original line number Diff line number Diff line
@@ -5097,39 +5097,3 @@ void lpfc_fabric_abort_hba(struct lpfc_hba *phba) 
		(piocb->iocb_cmpl) (phba, piocb, piocb);

	}

}
 




#if 0

void lpfc_fabric_abort_flogi(struct lpfc_hba *phba)

{

	LIST_HEAD(completions);

	struct lpfc_iocbq *tmp_iocb, *piocb;

	IOCB_t *cmd;

	struct lpfc_nodelist *ndlp;



	spin_lock_irq(&phba->hbalock);

	list_for_each_entry_safe(piocb, tmp_iocb, &phba->fabric_iocb_list,

				 list) {



		cmd = &piocb->iocb;

		ndlp = (struct lpfc_nodelist *) piocb->context1;

		if (cmd->ulpCommand == CMD_ELS_REQUEST64_CR &&

		    ndlp != NULL &&

		    ndlp->nlp_DID == Fabric_DID)

			list_move_tail(&piocb->list, &completions);

	}

	spin_unlock_irq(&phba->hbalock);



	while (!list_empty(&completions)) {

		piocb = list_get_first(&completions, struct lpfc_iocbq, list);

		list_del_init(&piocb->list);



		cmd = &piocb->iocb;

		cmd->ulpStatus = IOSTAT_LOCAL_REJECT;

		cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;

		(piocb->iocb_cmpl) (phba, piocb, piocb);

	}

}

#endif  /*  0  */

drivers/scsi/lpfc/lpfc_hbadisc.c

+0 −32
Original line number Diff line number Diff line
@@ -2948,24 +2948,6 @@ __lpfc_find_node(struct lpfc_vport *vport, node_filter filter, void *param) 
	return NULL;

}



#if 0

/*

 * Search node lists for a remote port matching filter criteria

 * Caller needs to hold host_lock before calling this routine.

 */

struct lpfc_nodelist *

lpfc_find_node(struct lpfc_vport *vport, node_filter filter, void *param)

{

	struct Scsi_Host     *shost = lpfc_shost_from_vport(vport);

	struct lpfc_nodelist *ndlp;



	spin_lock_irq(shost->host_lock);

	ndlp = __lpfc_find_node(vport, filter, param);

	spin_unlock_irq(shost->host_lock);

	return ndlp;

}

#endif  /*  0  */



/*

 * This routine looks up the ndlp lists for the given RPI. If rpi found it

 * returns the node list element pointer else return NULL.
@@ -2976,20 +2958,6 @@ __lpfc_findnode_rpi(struct lpfc_vport *vport, uint16_t rpi) 
	return __lpfc_find_node(vport, lpfc_filter_by_rpi, &rpi);

}



#if 0

struct lpfc_nodelist *

lpfc_findnode_rpi(struct lpfc_vport *vport, uint16_t rpi)

{

	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);

	struct lpfc_nodelist *ndlp;



	spin_lock_irq(shost->host_lock);

	ndlp = __lpfc_findnode_rpi(vport, rpi);

	spin_unlock_irq(shost->host_lock);

	return ndlp;

}

#endif  /*  0  */



/*

 * This routine looks up the ndlp lists for the given WWPN. If WWPN found it

 * returns the node element list pointer else return NULL.

CRA Git | Maintained and supported by SUSTech CRA and CCSE