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

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

[SCSI] lpfc 8.3.24: Add resource extent support 



This patch adds support for hardware that returns resource ids via
extents rather than contiguous ranges.

[jejb: checkpatch.pl fixes]
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 52d52440

drivers/scsi/lpfc/lpfc.h

+3 −0
Original line number Diff line number Diff line
@@ -780,6 +780,9 @@ struct lpfc_hba { 
	uint16_t vpi_base;

	uint16_t vfi_base;

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

	uint16_t *vpi_ids;

	uint16_t vpi_count;

	struct list_head lpfc_vpi_blk_list;



	/* Data structure used by fabric iocb scheduler */

	struct list_head fabric_iocb_list;

drivers/scsi/lpfc/lpfc_bsg.c

+6 −0
Original line number Diff line number Diff line
@@ -332,6 +332,8 @@ lpfc_bsg_send_mgmt_cmd(struct fc_bsg_job *job) 
	cmd->ulpLe = 1;

	cmd->ulpClass = CLASS3;

	cmd->ulpContext = ndlp->nlp_rpi;

	if (phba->sli_rev == LPFC_SLI_REV4)

		cmd->ulpContext = phba->sli4_hba.rpi_ids[ndlp->nlp_rpi];

	cmd->ulpOwner = OWN_CHIP;

	cmdiocbq->vport = phba->pport;

	cmdiocbq->context3 = bmp;
@@ -1336,6 +1338,10 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct fc_bsg_job *job, uint32_t tag, 
		}



		icmd->un.ulpWord[3] = ndlp->nlp_rpi;

		if (phba->sli_rev == LPFC_SLI_REV4)

			icmd->ulpContext =

				phba->sli4_hba.rpi_ids[ndlp->nlp_rpi];



		/* The exchange is done, mark the entry as invalid */

		phba->ct_ctx[tag].flags &= ~UNSOL_VALID;

	} else

drivers/scsi/lpfc/lpfc_crtn.h

+6 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ void lpfc_request_features(struct lpfc_hba *, struct lpfcMboxq *); 
void lpfc_supported_pages(struct lpfcMboxq *);

void lpfc_pc_sli4_params(struct lpfcMboxq *);

int lpfc_pc_sli4_params_get(struct lpfc_hba *, LPFC_MBOXQ_t *);

int lpfc_sli4_mbox_rsrc_extent(struct lpfc_hba *, struct lpfcMboxq *,

			   uint16_t, uint16_t, bool);

int lpfc_get_sli4_parameters(struct lpfc_hba *, LPFC_MBOXQ_t *);

struct lpfc_vport *lpfc_find_vport_by_did(struct lpfc_hba *, uint32_t);

void lpfc_cleanup_rcv_buffers(struct lpfc_vport *);
@@ -366,6 +368,10 @@ extern void lpfc_debugfs_slow_ring_trc(struct lpfc_hba *, char *, uint32_t, 
	uint32_t, uint32_t);

extern struct lpfc_hbq_init *lpfc_hbq_defs[];



/* SLI4 if_type 2 externs. */

int lpfc_sli4_alloc_resource_identifiers(struct lpfc_hba *);

int lpfc_sli4_dealloc_resource_identifiers(struct lpfc_hba *);



/* externs BlockGuard */

extern char *_dump_buf_data;

extern unsigned long _dump_buf_data_order;

drivers/scsi/lpfc/lpfc_ct.c

+2 −0
Original line number Diff line number Diff line
@@ -352,6 +352,8 @@ lpfc_gen_req(struct lpfc_vport *vport, struct lpfc_dmabuf *bmp, 
	icmd->ulpLe = 1;

	icmd->ulpClass = CLASS3;

	icmd->ulpContext = ndlp->nlp_rpi;

	if (phba->sli_rev == LPFC_SLI_REV4)

		icmd->ulpContext = phba->sli4_hba.rpi_ids[ndlp->nlp_rpi];



	if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) {

		/* For GEN_REQUEST64_CR, use the RPI */

drivers/scsi/lpfc/lpfc_els.c

+25 −3
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp, 
		icmd->un.elsreq64.myID = vport->fc_myDID;



		/* For ELS_REQUEST64_CR, use the VPI by default */

		icmd->ulpContext = vport->vpi + phba->vpi_base;

		icmd->ulpContext = phba->vpi_ids[vport->vpi];

		icmd->ulpCt_h = 0;

		/* The CT field must be 0=INVALID_RPI for the ECHO cmd */

		if (elscmd == ELS_CMD_ECHO)
@@ -454,6 +454,7 @@ lpfc_issue_reg_vfi(struct lpfc_vport *vport) 
		rc = -ENOMEM;

		goto fail_free_dmabuf;

	}



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

	if (!mboxq) {

		rc = -ENOMEM;
@@ -6585,6 +6586,26 @@ lpfc_find_vport_by_vpid(struct lpfc_hba *phba, uint16_t vpi) 
{

	struct lpfc_vport *vport;

	unsigned long flags;

	int i;



	/* The physical ports are always vpi 0 - translate is unnecessary. */

	if (vpi > 0) {

		/*

		 * Translate the physical vpi to the logical vpi.  The

		 * vport stores the logical vpi.

		 */

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

			if (vpi == phba->vpi_ids[i])

				break;

		}



		if (i >= phba->max_vpi) {

			lpfc_printf_log(phba, KERN_ERR, LOG_ELS,

					 "2936 Could not find Vport mapped "

					 "to vpi %d\n", vpi);

			return NULL;

		}

	}



	spin_lock_irqsave(&phba->hbalock, flags);

	list_for_each_entry(vport, &phba->port_list, listentry) {
@@ -6641,8 +6662,9 @@ lpfc_els_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
			vport = phba->pport;

		else

			vport = lpfc_find_vport_by_vpid(phba,

				icmd->unsli3.rcvsli3.vpi - phba->vpi_base);

						icmd->unsli3.rcvsli3.vpi);

	}



	/* If there are no BDEs associated

	 * with this IOCB, there is nothing to do.

	 */
@@ -7222,7 +7244,7 @@ lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
		elsiocb->iocb.ulpCt_h = (SLI4_CT_VPI >> 1) & 1;

		elsiocb->iocb.ulpCt_l = SLI4_CT_VPI & 1 ;

		/* Set the ulpContext to the vpi */

		elsiocb->iocb.ulpContext = vport->vpi + phba->vpi_base;

		elsiocb->iocb.ulpContext = phba->vpi_ids[vport->vpi];

	} else {

		/* For FDISC, Let FDISC rsp set the NPortID for this VPI */

		icmd->ulpCt_h = 1;