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

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

[SCSI] lpfc 8.2.7 : Miscellaneous Fixes 



Miscellaneous Fixes:
- Fix bug in mbox sysfs interface that locked in EAGAIN if discovery stalled.
- Fix missing error message when npiv and loop are true when link up occurs.
- Fix panic in lpfc_scsi_cmd_iocb_cmpl: scsi_buf was NULL, but created
  race conditions with other code paths.
- Fix error in sysfs mailbox structure that didn't rezero on next use.
- Add missing mempool_free() to attachment failure path
- Fix missing put of ndlp structure during driver unload.
- Fix applications unable to send mailbox commands during discovery.
- Remove unused argument (type) from function lpfc_post_buffer() API
- Fix vport name is not shown after hbacmd vportcreate.
- Remove repeated code statements.

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

drivers/scsi/lpfc/lpfc.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ struct lpfc_sli2_slim; 
#define LPFC_MAX_SG_SEG_CNT	256	/* sg element count per scsi cmnd */

#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 */

#define LPFC_VNAME_LEN		100	/* vport symbolic name length */



/*

 * Following time intervals are used of adjusting SCSI device

drivers/scsi/lpfc/lpfc_attr.c

+1 −2
Original line number Diff line number Diff line
@@ -1995,8 +1995,7 @@ sysfs_mbox_read(struct kobject *kobj, struct bin_attribute *bin_attr, 
		/* Don't allow mailbox commands to be sent when blocked

		 * or when in the middle of discovery

		 */

		if (phba->sli.sli_flag & LPFC_BLOCK_MGMT_IO ||

		    vport->fc_flag & FC_NDISC_ACTIVE) {

		if (phba->sli.sli_flag & LPFC_BLOCK_MGMT_IO) {

			sysfs_mbox_idle(phba);

			spin_unlock_irq(&phba->hbalock);

			return  -EAGAIN;

drivers/scsi/lpfc/lpfc_crtn.h

+2 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ int lpfc_config_port_post(struct lpfc_hba *); 
int lpfc_hba_down_prep(struct lpfc_hba *);

int lpfc_hba_down_post(struct lpfc_hba *);

void lpfc_hba_init(struct lpfc_hba *, uint32_t *);

int lpfc_post_buffer(struct lpfc_hba *, struct lpfc_sli_ring *, int, int);

int lpfc_post_buffer(struct lpfc_hba *, struct lpfc_sli_ring *, int);

void lpfc_decode_firmware_rev(struct lpfc_hba *, char *, int);

int lpfc_online(struct lpfc_hba *);

void lpfc_unblock_mgmt_io(struct lpfc_hba *);
@@ -263,6 +263,7 @@ extern int lpfc_sli_mode; 
extern int lpfc_enable_npiv;



int  lpfc_vport_symbolic_node_name(struct lpfc_vport *, char *, size_t);

int  lpfc_vport_symbolic_port_name(struct lpfc_vport *, char *,	size_t);

void lpfc_terminate_rport_io(struct fc_rport *);

void lpfc_dev_loss_tmo_callbk(struct fc_rport *rport);

drivers/scsi/lpfc/lpfc_ct.c

+3 −3
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ lpfc_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
		/* Not enough posted buffers; Try posting more buffers */

		phba->fc_stat.NoRcvBuf++;

		if (!(phba->sli3_options & LPFC_SLI3_HBQ_ENABLED))

			lpfc_post_buffer(phba, pring, 2, 1);

			lpfc_post_buffer(phba, pring, 2);

		return;

	}
@@ -151,7 +151,7 @@ lpfc_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
			}

			list_del(&iocbq->list);

			lpfc_sli_release_iocbq(phba, iocbq);

			lpfc_post_buffer(phba, pring, i, 1);

			lpfc_post_buffer(phba, pring, i);

		}

	}

}
@@ -990,7 +990,7 @@ lpfc_cmpl_ct_cmd_rff_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
	return;

}



static int

int

lpfc_vport_symbolic_port_name(struct lpfc_vport *vport, char *symbol,

	size_t size)

{

drivers/scsi/lpfc/lpfc_els.c

+2 −5
Original line number Diff line number Diff line
@@ -3857,9 +3857,6 @@ lpfc_els_timeout_handler(struct lpfc_vport *vport) 
		    els_command == ELS_CMD_FDISC)

			continue;



		if (vport != piocb->vport)

			continue;



		if (piocb->drvrTimeout > 0) {

			if (piocb->drvrTimeout >= timeout)

				piocb->drvrTimeout -= timeout;
@@ -4013,7 +4010,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
	payload = ((struct lpfc_dmabuf *)elsiocb->context2)->virt;

	cmd = *payload;

	if ((phba->sli3_options & LPFC_SLI3_HBQ_ENABLED) == 0)

		lpfc_post_buffer(phba, pring, 1, 1);

		lpfc_post_buffer(phba, pring, 1);



	did = icmd->un.rcvels.remoteID;

	if (icmd->ulpStatus) {
@@ -4322,7 +4319,7 @@ lpfc_els_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
		phba->fc_stat.NoRcvBuf++;

		/* Not enough posted buffers; Try posting more buffers */

		if (!(phba->sli3_options & LPFC_SLI3_HBQ_ENABLED))

			lpfc_post_buffer(phba, pring, 0, 1);

			lpfc_post_buffer(phba, pring, 0);

		return;

	}