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

[SCSI] lpfc 8.3.2 : Reorganization for SLI4 



Preps the organization of the driver so that the bottom half, which
interacts with the hardware, can share common code sequences for
attachment, detachment, initialization, teardown, etc with new hardware.

For very common code sections, which become specific to the interface
type, the driver uses an indirect function call. The function is set at
initialization. For less common sections, such as initialization, the
driver looks at the interface type and calls the routines relative to
the interface.

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

drivers/scsi/lpfc/lpfc.h

+69 −3
Original line number Diff line number Diff line
@@ -23,6 +23,13 @@ 


struct lpfc_sli2_slim;



#define LPFC_PCI_DEV_LP		0x1

#define LPFC_PCI_DEV_OC		0x2



#define LPFC_SLI_REV2		2

#define LPFC_SLI_REV3		3

#define LPFC_SLI_REV4		4



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

#define LPFC_MAX_DISC_THREADS	64	/* max outstanding discovery els

					   requests */
@@ -264,8 +271,8 @@ enum hba_state { 
};



struct lpfc_vport {

	struct list_head listentry;

	struct lpfc_hba *phba;

	struct list_head listentry;

	uint8_t port_type;

#define LPFC_PHYSICAL_PORT 1

#define LPFC_NPIV_PORT  2
@@ -420,8 +427,66 @@ enum intr_type_t { 
};



struct lpfc_hba {

	/* SCSI interface function jump table entries */

	int (*lpfc_new_scsi_buf)

		(struct lpfc_vport *, int);

	struct lpfc_scsi_buf * (*lpfc_get_scsi_buf)

		(struct lpfc_hba *);

	int (*lpfc_scsi_prep_dma_buf)

		(struct lpfc_hba *, struct lpfc_scsi_buf *);

	void (*lpfc_scsi_unprep_dma_buf)

		(struct lpfc_hba *, struct lpfc_scsi_buf *);

	void (*lpfc_release_scsi_buf)

		(struct lpfc_hba *, struct lpfc_scsi_buf *);

	void (*lpfc_rampdown_queue_depth)

		(struct lpfc_hba *);

	void (*lpfc_scsi_prep_cmnd)

		(struct lpfc_vport *, struct lpfc_scsi_buf *,

		 struct lpfc_nodelist *);

	int (*lpfc_scsi_prep_task_mgmt_cmd)

		(struct lpfc_vport *, struct lpfc_scsi_buf *,

		 unsigned int, uint8_t);



	/* IOCB interface function jump table entries */

	int (*__lpfc_sli_issue_iocb)

		(struct lpfc_hba *, uint32_t,

		 struct lpfc_iocbq *, uint32_t);

	void (*__lpfc_sli_release_iocbq)(struct lpfc_hba *,

			 struct lpfc_iocbq *);

	int (*lpfc_hba_down_post)(struct lpfc_hba *phba);





	IOCB_t * (*lpfc_get_iocb_from_iocbq)

		(struct lpfc_iocbq *);

	void (*lpfc_scsi_cmd_iocb_cmpl)

		(struct lpfc_hba *, struct lpfc_iocbq *, struct lpfc_iocbq *);



	/* MBOX interface function jump table entries */

	int (*lpfc_sli_issue_mbox)

		(struct lpfc_hba *, LPFC_MBOXQ_t *, uint32_t);

	/* Slow-path IOCB process function jump table entries */

	void (*lpfc_sli_handle_slow_ring_event)

		(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,

		 uint32_t mask);

	/* INIT device interface function jump table entries */

	int (*lpfc_sli_hbq_to_firmware)

		(struct lpfc_hba *, uint32_t, struct hbq_dmabuf *);

	int (*lpfc_sli_brdrestart)

		(struct lpfc_hba *);

	int (*lpfc_sli_brdready)

		(struct lpfc_hba *, uint32_t);

	void (*lpfc_handle_eratt)

		(struct lpfc_hba *);

	void (*lpfc_stop_port)

		(struct lpfc_hba *);





	/* SLI4 specific HBA data structure */

	struct lpfc_sli4_hba sli4_hba;



	struct lpfc_sli sli;

	uint32_t sli_rev;		/* SLI2 or SLI3 */

	uint8_t pci_dev_grp;	/* lpfc PCI dev group: 0x0, 0x1, 0x2,... */

	uint32_t sli_rev;		/* SLI2, SLI3, or SLI4 */

	uint32_t sli3_options;		/* Mask of enabled SLI3 options */

#define LPFC_SLI3_HBQ_ENABLED		0x01

#define LPFC_SLI3_NPIV_ENABLED		0x02
@@ -526,11 +591,12 @@ struct lpfc_hba { 
	unsigned long data_flags;



	uint32_t hbq_in_use;		/* HBQs in use flag */

	struct list_head hbqbuf_in_list;  /* in-fly hbq buffer list */

	struct list_head rb_pend_list;  /* Received buffers to be processed */

	uint32_t hbq_count;	        /* Count of configured HBQs */

	struct hbq_s hbqs[LPFC_MAX_HBQS]; /* local copy of hbq indicies  */



	unsigned long pci_bar0_map;     /* Physical address for PCI BAR0 */

	unsigned long pci_bar1_map;     /* Physical address for PCI BAR1 */

	unsigned long pci_bar2_map;     /* Physical address for PCI BAR2 */

	void __iomem *slim_memmap_p;	/* Kernel memory mapped address for

					   PCI BAR0 */

drivers/scsi/lpfc/lpfc_ct.c

+1 −3
Original line number Diff line number Diff line
@@ -267,8 +267,6 @@ lpfc_gen_req(struct lpfc_vport *vport, struct lpfc_dmabuf *bmp, 
	     uint32_t tmo, uint8_t retry)

{

	struct lpfc_hba  *phba = vport->phba;

	struct lpfc_sli  *psli = &phba->sli;

	struct lpfc_sli_ring *pring = &psli->ring[LPFC_ELS_RING];

	IOCB_t *icmd;

	struct lpfc_iocbq *geniocb;

	int rc;
@@ -331,7 +329,7 @@ lpfc_gen_req(struct lpfc_vport *vport, struct lpfc_dmabuf *bmp, 
	geniocb->drvrTimeout = icmd->ulpTimeout + LPFC_DRVR_TIMEOUT;

	geniocb->vport = vport;

	geniocb->retry = retry;

	rc = lpfc_sli_issue_iocb(phba, pring, geniocb, 0);

	rc = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, geniocb, 0);



	if (rc == IOCB_ERROR) {

		lpfc_sli_release_iocbq(phba, geniocb);

drivers/scsi/lpfc/lpfc_debugfs.c

+11 −6
Original line number Diff line number Diff line
@@ -280,6 +280,8 @@ lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size) 
	struct lpfc_dmabuf *d_buf;

	struct hbq_dmabuf *hbq_buf;



	if (phba->sli_rev != 3)

		return 0;

	cnt = LPFC_HBQINFO_SIZE;

	spin_lock_irq(&phba->hbalock);
@@ -489,12 +491,15 @@ lpfc_debugfs_dumpHostSlim_data(struct lpfc_hba *phba, char *buf, int size) 
				 pring->next_cmdidx, pring->local_getidx,

				 pring->flag, pgpp->rspPutInx, pring->numRiocb);

	}



	if (phba->sli_rev <= LPFC_SLI_REV3) {

		word0 = readl(phba->HAregaddr);

		word1 = readl(phba->CAregaddr);

		word2 = readl(phba->HSregaddr);

		word3 = readl(phba->HCregaddr);

	len +=  snprintf(buf+len, size-len, "HA:%08x CA:%08x HS:%08x HC:%08x\n",

	word0, word1, word2, word3);

		len +=  snprintf(buf+len, size-len, "HA:%08x CA:%08x HS:%08x "

				 "HC:%08x\n", word0, word1, word2, word3);

	}

	spin_unlock_irq(&phba->hbalock);

	return len;

}

drivers/scsi/lpfc/lpfc_els.c

+27 −57
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ lpfc_els_chk_latt(struct lpfc_vport *vport) 
	uint32_t ha_copy;



	if (vport->port_state >= LPFC_VPORT_READY ||

	    phba->link_state == LPFC_LINK_DOWN)

	    phba->link_state == LPFC_LINK_DOWN ||

	    phba->sli_rev > LPFC_SLI_REV3)

		return 0;



	/* Read the HBA Host Attention Register */
@@ -305,7 +306,7 @@ els_iocb_free_pcmb_exit: 
 *   0 - successfully issued fabric registration login for @vport

 *   -ENXIO -- failed to issue fabric registration login for @vport

 **/

static int

int

lpfc_issue_fabric_reglogin(struct lpfc_vport *vport)

{

	struct lpfc_hba  *phba = vport->phba;
@@ -345,8 +346,7 @@ lpfc_issue_fabric_reglogin(struct lpfc_vport *vport) 
		err = 4;

		goto fail;

	}

	rc = lpfc_reg_login(phba, vport->vpi, Fabric_DID, (uint8_t *)sp, mbox,

			    0);

	rc = lpfc_reg_rpi(phba, vport->vpi, Fabric_DID, (uint8_t *)sp, mbox, 0);

	if (rc) {

		err = 5;

		goto fail_free_mbox;
@@ -1350,14 +1350,12 @@ lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry) 
	IOCB_t *icmd;

	struct lpfc_nodelist *ndlp;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli_ring *pring;

	struct lpfc_sli *psli;

	uint8_t *pcmd;

	uint16_t cmdsize;

	int ret;



	psli = &phba->sli;

	pring = &psli->ring[LPFC_ELS_RING];	/* ELS ring */



	ndlp = lpfc_findnode_did(vport, did);

	if (ndlp && !NLP_CHK_NODE_ACT(ndlp))
@@ -1391,7 +1389,7 @@ lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry) 


	phba->fc_stat.elsXmitPLOGI++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_plogi;

	ret = lpfc_sli_issue_iocb(phba, pring, elsiocb, 0);

	ret = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0);



	if (ret == IOCB_ERROR) {

		lpfc_els_free_iocb(phba, elsiocb);
@@ -1501,14 +1499,9 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	PRLI *npr;

	IOCB_t *icmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli_ring *pring;

	struct lpfc_sli *psli;

	uint8_t *pcmd;

	uint16_t cmdsize;



	psli = &phba->sli;

	pring = &psli->ring[LPFC_ELS_RING];	/* ELS ring */



	cmdsize = (sizeof(uint32_t) + sizeof(PRLI));

	elsiocb = lpfc_prep_els_iocb(vport, 1, cmdsize, retry, ndlp,

				     ndlp->nlp_DID, ELS_CMD_PRLI);
@@ -1550,7 +1543,8 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	spin_lock_irq(shost->host_lock);

	ndlp->nlp_flag |= NLP_PRLI_SND;

	spin_unlock_irq(shost->host_lock);

	if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {

	if (lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0) ==

	    IOCB_ERROR) {

		spin_lock_irq(shost->host_lock);

		ndlp->nlp_flag &= ~NLP_PRLI_SND;

		spin_unlock_irq(shost->host_lock);
@@ -1788,8 +1782,6 @@ lpfc_issue_els_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	ADISC *ap;

	IOCB_t *icmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli *psli = &phba->sli;

	struct lpfc_sli_ring *pring = &psli->ring[LPFC_ELS_RING];

	uint8_t *pcmd;

	uint16_t cmdsize;
@@ -1822,7 +1814,8 @@ lpfc_issue_els_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	spin_lock_irq(shost->host_lock);

	ndlp->nlp_flag |= NLP_ADISC_SND;

	spin_unlock_irq(shost->host_lock);

	if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {

	if (lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0) ==

	    IOCB_ERROR) {

		spin_lock_irq(shost->host_lock);

		ndlp->nlp_flag &= ~NLP_ADISC_SND;

		spin_unlock_irq(shost->host_lock);
@@ -1937,15 +1930,10 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	struct lpfc_hba  *phba = vport->phba;

	IOCB_t *icmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli_ring *pring;

	struct lpfc_sli *psli;

	uint8_t *pcmd;

	uint16_t cmdsize;

	int rc;



	psli = &phba->sli;

	pring = &psli->ring[LPFC_ELS_RING];



	spin_lock_irq(shost->host_lock);

	if (ndlp->nlp_flag & NLP_LOGO_SND) {

		spin_unlock_irq(shost->host_lock);
@@ -1978,7 +1966,7 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	spin_lock_irq(shost->host_lock);

	ndlp->nlp_flag |= NLP_LOGO_SND;

	spin_unlock_irq(shost->host_lock);

	rc = lpfc_sli_issue_iocb(phba, pring, elsiocb, 0);

	rc = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0);



	if (rc == IOCB_ERROR) {

		spin_lock_irq(shost->host_lock);
@@ -2058,14 +2046,12 @@ lpfc_issue_els_scr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry) 
	struct lpfc_hba  *phba = vport->phba;

	IOCB_t *icmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli_ring *pring;

	struct lpfc_sli *psli;

	uint8_t *pcmd;

	uint16_t cmdsize;

	struct lpfc_nodelist *ndlp;



	psli = &phba->sli;

	pring = &psli->ring[LPFC_ELS_RING];	/* ELS ring */

	cmdsize = (sizeof(uint32_t) + sizeof(SCR));



	ndlp = lpfc_findnode_did(vport, nportid);
@@ -2108,7 +2094,8 @@ lpfc_issue_els_scr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry) 


	phba->fc_stat.elsXmitSCR++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_cmd;

	if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {

	if (lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0) ==

	    IOCB_ERROR) {

		/* The additional lpfc_nlp_put will cause the following

		 * lpfc_els_free_iocb routine to trigger the rlease of

		 * the node.
@@ -2152,7 +2139,6 @@ lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry) 
	struct lpfc_hba  *phba = vport->phba;

	IOCB_t *icmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli_ring *pring;

	struct lpfc_sli *psli;

	FARP *fp;

	uint8_t *pcmd;
@@ -2162,7 +2148,6 @@ lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry) 
	struct lpfc_nodelist *ndlp;



	psli = &phba->sli;

	pring = &psli->ring[LPFC_ELS_RING];	/* ELS ring */

	cmdsize = (sizeof(uint32_t) + sizeof(FARP));



	ndlp = lpfc_findnode_did(vport, nportid);
@@ -2219,7 +2204,8 @@ lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry) 


	phba->fc_stat.elsXmitFARPR++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_cmd;

	if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {

	if (lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0) ==

	    IOCB_ERROR) {

		/* The additional lpfc_nlp_put will cause the following

		 * lpfc_els_free_iocb routine to trigger the release of

		 * the node.
@@ -2961,6 +2947,7 @@ lpfc_mbx_cmpl_dflt_rpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
		 */

		lpfc_nlp_not_used(ndlp);

	}



	return;

}
@@ -3170,7 +3157,6 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag, 
	IOCB_t *icmd;

	IOCB_t *oldcmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli_ring *pring;

	struct lpfc_sli *psli;

	uint8_t *pcmd;

	uint16_t cmdsize;
@@ -3178,7 +3164,6 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag, 
	ELS_PKT *els_pkt_ptr;



	psli = &phba->sli;

	pring = &psli->ring[LPFC_ELS_RING];	/* ELS ring */

	oldcmd = &oldiocb->iocb;



	switch (flag) {
@@ -3266,7 +3251,7 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag, 
	}



	phba->fc_stat.elsXmitACC++;

	rc = lpfc_sli_issue_iocb(phba, pring, elsiocb, 0);

	rc = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0);

	if (rc == IOCB_ERROR) {

		lpfc_els_free_iocb(phba, elsiocb);

		return 1;
@@ -3305,15 +3290,12 @@ lpfc_els_rsp_reject(struct lpfc_vport *vport, uint32_t rejectError, 
	IOCB_t *icmd;

	IOCB_t *oldcmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli_ring *pring;

	struct lpfc_sli *psli;

	uint8_t *pcmd;

	uint16_t cmdsize;

	int rc;



	psli = &phba->sli;

	pring = &psli->ring[LPFC_ELS_RING];	/* ELS ring */



	cmdsize = 2 * sizeof(uint32_t);

	elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry, ndlp,

				     ndlp->nlp_DID, ELS_CMD_LS_RJT);
@@ -3346,7 +3328,7 @@ lpfc_els_rsp_reject(struct lpfc_vport *vport, uint32_t rejectError, 


	phba->fc_stat.elsXmitLSRJT++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	rc = lpfc_sli_issue_iocb(phba, pring, elsiocb, 0);

	rc = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0);



	if (rc == IOCB_ERROR) {

		lpfc_els_free_iocb(phba, elsiocb);
@@ -3379,8 +3361,6 @@ lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb, 
		       struct lpfc_nodelist *ndlp)

{

	struct lpfc_hba  *phba = vport->phba;

	struct lpfc_sli  *psli = &phba->sli;

	struct lpfc_sli_ring *pring = &psli->ring[LPFC_ELS_RING];

	ADISC *ap;

	IOCB_t *icmd, *oldcmd;

	struct lpfc_iocbq *elsiocb;
@@ -3422,7 +3402,7 @@ lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb, 


	phba->fc_stat.elsXmitACC++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	rc = lpfc_sli_issue_iocb(phba, pring, elsiocb, 0);

	rc = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0);

	if (rc == IOCB_ERROR) {

		lpfc_els_free_iocb(phba, elsiocb);

		return 1;
@@ -3459,14 +3439,12 @@ lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb, 
	IOCB_t *icmd;

	IOCB_t *oldcmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli_ring *pring;

	struct lpfc_sli *psli;

	uint8_t *pcmd;

	uint16_t cmdsize;

	int rc;



	psli = &phba->sli;

	pring = &psli->ring[LPFC_ELS_RING];	/* ELS ring */



	cmdsize = sizeof(uint32_t) + sizeof(PRLI);

	elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry, ndlp,
@@ -3520,7 +3498,7 @@ lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb, 
	phba->fc_stat.elsXmitACC++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;



	rc = lpfc_sli_issue_iocb(phba, pring, elsiocb, 0);

	rc = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0);

	if (rc == IOCB_ERROR) {

		lpfc_els_free_iocb(phba, elsiocb);

		return 1;
@@ -3562,15 +3540,12 @@ lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format, 
	RNID *rn;

	IOCB_t *icmd, *oldcmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli_ring *pring;

	struct lpfc_sli *psli;

	uint8_t *pcmd;

	uint16_t cmdsize;

	int rc;



	psli = &phba->sli;

	pring = &psli->ring[LPFC_ELS_RING];



	cmdsize = sizeof(uint32_t) + sizeof(uint32_t)

					+ (2 * sizeof(struct lpfc_name));

	if (format)
@@ -3626,7 +3601,7 @@ lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format, 
	elsiocb->context1 = NULL;  /* Don't need ndlp for cmpl,

				    * it could be freed */



	rc = lpfc_sli_issue_iocb(phba, pring, elsiocb, 0);

	rc = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0);

	if (rc == IOCB_ERROR) {

		lpfc_els_free_iocb(phba, elsiocb);

		return 1;
@@ -4440,8 +4415,6 @@ lpfc_els_rcv_lirr(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
static void

lpfc_els_rsp_rps_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

{

	struct lpfc_sli *psli = &phba->sli;

	struct lpfc_sli_ring *pring = &psli->ring[LPFC_ELS_RING];

	MAILBOX_t *mb;

	IOCB_t *icmd;

	RPS_RSP *rps_rsp;
@@ -4507,7 +4480,7 @@ lpfc_els_rsp_rps_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
			 ndlp->nlp_rpi);

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	phba->fc_stat.elsXmitACC++;

	if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR)

	if (lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0) == IOCB_ERROR)

		lpfc_els_free_iocb(phba, elsiocb);

	return;

}
@@ -4616,8 +4589,6 @@ lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize, 
	IOCB_t *icmd, *oldcmd;

	RPL_RSP rpl_rsp;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_sli *psli = &phba->sli;

	struct lpfc_sli_ring *pring = &psli->ring[LPFC_ELS_RING];

	uint8_t *pcmd;



	elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry, ndlp,
@@ -4654,7 +4625,8 @@ lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize, 
			 ndlp->nlp_rpi);

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	phba->fc_stat.elsXmitACC++;

	if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {

	if (lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0) ==

	    IOCB_ERROR) {

		lpfc_els_free_iocb(phba, elsiocb);

		return 1;

	}
@@ -6139,7 +6111,6 @@ lpfc_issue_els_npiv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) 
{

	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);

	struct lpfc_hba  *phba = vport->phba;

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

	IOCB_t *icmd;

	struct lpfc_iocbq *elsiocb;

	uint8_t *pcmd;
@@ -6169,7 +6140,8 @@ lpfc_issue_els_npiv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) 
	spin_lock_irq(shost->host_lock);

	ndlp->nlp_flag |= NLP_LOGO_SND;

	spin_unlock_irq(shost->host_lock);

	if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {

	if (lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, elsiocb, 0) ==

	    IOCB_ERROR) {

		spin_lock_irq(shost->host_lock);

		ndlp->nlp_flag &= ~NLP_LOGO_SND;

		spin_unlock_irq(shost->host_lock);
@@ -6224,7 +6196,6 @@ lpfc_resume_fabric_iocbs(struct lpfc_hba *phba) 
	struct lpfc_iocbq *iocb;

	unsigned long iflags;

	int ret;

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

	IOCB_t *cmd;



repeat:
@@ -6248,7 +6219,7 @@ repeat: 
			"Fabric sched1:   ste:x%x",

			iocb->vport->port_state, 0, 0);



		ret = lpfc_sli_issue_iocb(phba, pring, iocb, 0);

		ret = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, iocb, 0);



		if (ret == IOCB_ERROR) {

			iocb->iocb_cmpl = iocb->fabric_iocb_cmpl;
@@ -6394,7 +6365,6 @@ static int 
lpfc_issue_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *iocb)

{

	unsigned long iflags;

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

	int ready;

	int ret;
@@ -6418,7 +6388,7 @@ lpfc_issue_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *iocb) 
			"Fabric sched2:   ste:x%x",

			iocb->vport->port_state, 0, 0);



		ret = lpfc_sli_issue_iocb(phba, pring, iocb, 0);

		ret = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, iocb, 0);



		if (ret == IOCB_ERROR) {

			iocb->iocb_cmpl = iocb->fabric_iocb_cmpl;

drivers/scsi/lpfc/lpfc_hbadisc.c

+38 −31
Original line number Diff line number Diff line
@@ -555,6 +555,7 @@ lpfc_work_done(struct lpfc_hba *phba) 
		/*

		 * Turn on Ring interrupts

		 */

		if (phba->sli_rev <= LPFC_SLI_REV3) {

			spin_lock_irq(&phba->hbalock);

			control = readl(phba->HCregaddr);

			if (!(control & (HC_R0INT_ENA << LPFC_ELS_RING))) {
@@ -565,14 +566,14 @@ lpfc_work_done(struct lpfc_hba *phba) 
				control |= (HC_R0INT_ENA << LPFC_ELS_RING);

				writel(control, phba->HCregaddr);

				readl(phba->HCregaddr); /* flush */

		}

		else {

			} else {

				lpfc_debugfs_slow_ring_trc(phba,

					"WRK Ring ok:     cntl:x%x hacopy:x%x",

					control, ha_copy, 0);

			}

			spin_unlock_irq(&phba->hbalock);

		}

	}

	lpfc_work_list_done(phba);

}
@@ -689,7 +690,7 @@ lpfc_port_link_failure(struct lpfc_vport *vport) 
	lpfc_can_disctmo(vport);

}



static void

void

lpfc_linkdown_port(struct lpfc_vport *vport)

{

	struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
@@ -1147,10 +1148,12 @@ lpfc_enable_la(struct lpfc_hba *phba) 
	struct lpfc_sli *psli = &phba->sli;

	spin_lock_irq(&phba->hbalock);

	psli->sli_flag |= LPFC_PROCESS_LA;

	if (phba->sli_rev <= LPFC_SLI_REV3) {

		control = readl(phba->HCregaddr);

		control |= HC_LAINT_ENA;

		writel(control, phba->HCregaddr);

		readl(phba->HCregaddr); /* flush */

	}

	spin_unlock_irq(&phba->hbalock);

}
@@ -2919,12 +2922,14 @@ restart_disc: 
		 * set port_state to PORT_READY if SLI2.

		 * cmpl_reg_vpi will set port_state to READY for SLI3.

		 */

		if (phba->sli_rev < LPFC_SLI_REV4) {

			if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED)

				lpfc_issue_reg_vpi(phba, vport);

			else  {	/* NPIV Not enabled */

				lpfc_issue_clear_la(phba, vport);

				vport->port_state = LPFC_VPORT_READY;

			}

		}



		/* Setup and issue mailbox INITIALIZE LINK command */

		initlinkmbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
@@ -2959,12 +2964,14 @@ restart_disc: 
		 * set port_state to PORT_READY if SLI2.

		 * cmpl_reg_vpi will set port_state to READY for SLI3.

		 */

		if (phba->sli_rev < LPFC_SLI_REV4) {

			if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED)

				lpfc_issue_reg_vpi(phba, vport);

			else  {	/* NPIV Not enabled */

				lpfc_issue_clear_la(phba, vport);

				vport->port_state = LPFC_VPORT_READY;

			}

		}

		break;



	case LPFC_VPORT_READY:

CRA Git | Maintained and supported by SUSTech CRA and CCSE