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

Commit cb733e35 authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: cleanup: convert eq_delay to usdelay 



Review of the eq coalescing logic showed the code was a bit fragmented.
Sometimes it would save/set via an interrupt max value, while in others it
would do so via a usdelay. There were also two places changing eq delay,
one place that issued mailbox commands, and another that changed via
register writes if supported.

Clean this up by:

 - Standardizing the operation of lpfc_modify_hba_eq_delay() routine so
   that it is always told of a us delay to impose. The routine then chooses
   the best way to set that - via register or via mbx.

 - Rather than two value types stored in eq->q_mode (usdelay if change via
   register, imax if change via mbox) - q_mode always contains usdelay.
   Before any value change, old vs new value is compared and only if
   different is a change done.

 - Revised the dmult calculation. dmult is not set based on overall imax
   divided by hardware queues - instead imax applies to a single cpu and
   the value will be replicated to all cpus.

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6a828b0f

drivers/scsi/lpfc/lpfc_attr.c

+7 −1
Original line number Diff line number Diff line
@@ -4935,6 +4935,7 @@ lpfc_fcp_imax_store(struct device *dev, struct device_attribute *attr, 
	struct Scsi_Host *shost = class_to_shost(dev);

	struct lpfc_vport *vport = (struct lpfc_vport *)shost->hostdata;

	struct lpfc_hba *phba = vport->phba;

	uint32_t usdelay;

	int val = 0, i;



	/* fcp_imax is only valid for SLI4 */
@@ -4958,9 +4959,14 @@ lpfc_fcp_imax_store(struct device *dev, struct device_attribute *attr, 
	phba->cfg_fcp_imax = (uint32_t)val;

	phba->initial_imax = phba->cfg_fcp_imax;



	if (phba->cfg_fcp_imax)

		usdelay = LPFC_SEC_TO_USEC / phba->cfg_fcp_imax;

	else

		usdelay = 0;



	for (i = 0; i < phba->cfg_irq_chann; i += LPFC_MAX_EQ_DELAY_EQID_CNT)

		lpfc_modify_hba_eq_delay(phba, i, LPFC_MAX_EQ_DELAY_EQID_CNT,

					 val);

					 usdelay);



	return strlen(buf);

}

drivers/scsi/lpfc/lpfc_init.c

+7 −2
Original line number Diff line number Diff line
@@ -9336,7 +9336,7 @@ lpfc_sli4_queue_setup(struct lpfc_hba *phba) 
	struct lpfc_sli4_hdw_queue *qp;

	LPFC_MBOXQ_t *mboxq;

	int qidx;

	uint32_t length;

	uint32_t length, usdelay;

	int rc = -ENOMEM;



	/* Check for dual-ULP support */
@@ -9643,10 +9643,15 @@ lpfc_sli4_queue_setup(struct lpfc_hba *phba) 
			phba->sli4_hba.dat_rq->queue_id,

			phba->sli4_hba.els_cq->queue_id);



	if (phba->cfg_fcp_imax)

		usdelay = LPFC_SEC_TO_USEC / phba->cfg_fcp_imax;

	else

		usdelay = 0;



	for (qidx = 0; qidx < phba->cfg_irq_chann;

	     qidx += LPFC_MAX_EQ_DELAY_EQID_CNT)

		lpfc_modify_hba_eq_delay(phba, qidx, LPFC_MAX_EQ_DELAY_EQID_CNT,

					 phba->cfg_fcp_imax);

					 usdelay);



	if (phba->sli4_hba.cq_max) {

		kfree(phba->sli4_hba.cq_lookup);

drivers/scsi/lpfc/lpfc_sli.c

+73 −53
Original line number Diff line number Diff line
@@ -14425,43 +14425,86 @@ lpfc_dual_chute_pci_bar_map(struct lpfc_hba *phba, uint16_t pci_barset) 
}















/**













 * lpfc_modify_hba_eq_delay - Modify Delay Multiplier on FCP EQs













 * @phba: HBA structure that indicates port to create a queue on.













 * @startq: The starting FCP EQ to modify













 *













 * This function sends an MODIFY_EQ_DELAY mailbox command to the HBA.













 * The command allows up to LPFC_MAX_EQ_DELAY_EQID_CNT EQ ID's to be













 * updated in one mailbox command.













 *













 * The @phba struct is used to send mailbox command to HBA. The @startq













 * is used to get the starting FCP EQ to change.













 * This function is asynchronous and will wait for the mailbox













 * command to finish before continuing.













 *













 * On success this function will return a zero. If unable to allocate enough













 * memory this function will return -ENOMEM. If the queue create mailbox command













 * fails this function will return -ENXIO.













 * lpfc_modify_hba_eq_delay - Modify Delay Multiplier on EQs













 * @phba: HBA structure that EQs are on.













 * @startq: The starting EQ index to modify













 * @numq: The number of EQs (consecutive indexes) to modify













 * @usdelay: amount of delay













 *













 * This function revises the EQ delay on 1 or more EQs. The EQ delay













 * is set either by writing to a register (if supported by the SLI Port)













 * or by mailbox command. The mailbox command allows several EQs to be













 * updated at once.













 *













 * The @phba struct is used to send a mailbox command to HBA. The @startq













 * is used to get the starting EQ index to change. The @numq value is













 * used to specify how many consecutive EQ indexes, starting at EQ index,













 * are to be changed. This function is asynchronous and will wait for any













 * mailbox commands to finish before returning.













 *













 * On success this function will return a zero. If unable to allocate













 * enough memory this function will return -ENOMEM. If a mailbox command













 * fails this function will return -ENXIO. Note: on ENXIO, some EQs may













 * have had their delay multipler changed.















 **/













int













void















lpfc_modify_hba_eq_delay(struct lpfc_hba *phba, uint32_t startq,













			 uint32_t numq, uint32_t imax)













			 uint32_t numq, uint32_t usdelay)















{















	struct lpfc_mbx_modify_eq_delay *eq_delay;















	LPFC_MBOXQ_t *mbox;















	struct lpfc_queue *eq;













	int cnt, rc, length, status = 0;













	int cnt = 0, rc, length;















	uint32_t shdr_status, shdr_add_status;













	uint32_t result, val;













	uint32_t dmult;













	struct lpfc_register reg_data;















	int qidx;















	union lpfc_sli4_cfg_shdr *shdr;













	uint16_t dmult;





























	if (startq >= phba->cfg_irq_chann)













		return 0;













		return;

























	if (usdelay > 0xFFFF) {













		lpfc_printf_log(phba, KERN_INFO, LOG_INIT | LOG_FCP | LOG_NVME,













				"6429 usdelay %d too large. Scaled down to "













				"0xFFFF.\n", usdelay);













		usdelay = 0xFFFF;













	}

























	/* set values by EQ_DELAY register if supported */













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













		for (qidx = startq; qidx < phba->cfg_irq_chann; qidx++) {













			eq = phba->sli4_hba.hdwq[qidx].hba_eq;













			if (!eq)













				continue;

























			/* save value last set */













			eq->q_mode = usdelay;

























			/* write register */













			reg_data.word0 = 0;













			bf_set(lpfc_sliport_eqdelay_id, &reg_data,













					eq->queue_id);













			bf_set(lpfc_sliport_eqdelay_delay, &reg_data, usdelay);













			writel(reg_data.word0,













					phba->sli4_hba.u.if_type2.EQDregaddr);

























			if (++cnt >= numq)













				break;













		}

























		return;













	}

























	/* Otherwise, set values by mailbox cmd */





























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













	if (!mbox)













		return -ENOMEM;













	if (!mbox) {













		lpfc_printf_log(phba, KERN_ERR, LOG_INIT | LOG_FCP | LOG_NVME,













				"6428 Failed allocating mailbox cmd buffer."













				" EQ delay was not set.\n");













		return;













	}















	length = (sizeof(struct lpfc_mbx_modify_eq_delay) -















		  sizeof(struct lpfc_sli4_cfg_mhdr));















	lpfc_sli4_config(phba, mbox, LPFC_MBOX_SUBSYSTEM_COMMON,









@@ -14470,44 +14513,22 @@ lpfc_modify_hba_eq_delay(struct lpfc_hba *phba, uint32_t startq,













	eq_delay = &mbox->u.mqe.un.eq_delay;





























	/* Calculate delay multiper from maximum interrupt per second */













	result = imax / phba->cfg_irq_chann;













	if (result > LPFC_DMULT_CONST || result == 0)













		dmult = 0;













	else













		dmult = LPFC_DMULT_CONST/result - 1;













	dmult = (usdelay * LPFC_DMULT_CONST) / LPFC_SEC_TO_USEC;













	if (dmult)













		dmult--;















	if (dmult > LPFC_DMULT_MAX)















		dmult = LPFC_DMULT_MAX;



























	cnt = 0;















	for (qidx = startq; qidx < phba->cfg_irq_chann; qidx++) {















		eq = phba->sli4_hba.hdwq[qidx].hba_eq;















		if (!eq)















			continue;













		eq->q_mode = imax;













		eq->q_mode = usdelay;















		eq_delay->u.request.eq[cnt].eq_id = eq->queue_id;















		eq_delay->u.request.eq[cnt].phase = 0;















		eq_delay->u.request.eq[cnt].delay_multi = dmult;













		cnt++;

























		/* q_mode is only used for auto_imax */













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













			/* Use EQ Delay Register method for q_mode */

























			/* Convert for EQ Delay register */













			val =  phba->cfg_fcp_imax;













			if (val) {













				/* First, interrupts per sec per EQ */













				val = phba->cfg_fcp_imax / phba->cfg_irq_chann;

























				/* us delay between each interrupt */













				val = LPFC_SEC_TO_USEC / val;













			}













			eq->q_mode = val;













		} else {













			eq->q_mode = imax;













		}



























		if (cnt >= numq)













		if (++cnt >= numq)















			break;















	}















	eq_delay->u.request.num_eq = cnt;









@@ -14525,10 +14546,9 @@ lpfc_modify_hba_eq_delay(struct lpfc_hba *phba, uint32_t startq,













				"2512 MODIFY_EQ_DELAY mailbox failed with "















				"status x%x add_status x%x, mbx status x%x\n",















				shdr_status, shdr_add_status, rc);













		status = -ENXIO;















	}















	mempool_free(mbox, phba->mbox_mem_pool);













	return status;













	return;















}





























/**

































drivers/scsi/lpfc/lpfc_sli4.h



+2
−2




























Original line number
Diff line number
Diff line








@@ -956,8 +956,8 @@ struct lpfc_queue *lpfc_sli4_queue_alloc(struct lpfc_hba *, uint32_t,













					 uint32_t, uint32_t);















void lpfc_sli4_queue_free(struct lpfc_queue *);















int lpfc_eq_create(struct lpfc_hba *, struct lpfc_queue *, uint32_t);













int lpfc_modify_hba_eq_delay(struct lpfc_hba *phba, uint32_t startq,













			     uint32_t numq, uint32_t imax);













void lpfc_modify_hba_eq_delay(struct lpfc_hba *phba, uint32_t startq,













			     uint32_t numq, uint32_t usdelay);















int lpfc_cq_create(struct lpfc_hba *, struct lpfc_queue *,















			struct lpfc_queue *, uint32_t, uint32_t);















int lpfc_cq_create_set(struct lpfc_hba *phba, struct lpfc_queue **cqp,