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

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

scsi: lpfc: Rename LPFC_MAX_EQ_DELAY to LPFC_MAX_EQ_DELAY_EQID_CNT 



Without apriori understanding of what the define is, the name gives
a very different impression of what it is (a max delay value
for an EQ).  Rename the define so it reflects what it is: the number
of EQ IDs that can be set in one instance of the MODIFY_EQ_DELAY
mbx command.

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 166d7211

drivers/scsi/lpfc/lpfc_attr.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -4457,7 +4457,8 @@ lpfc_fcp_imax_store(struct device *dev, struct device_attribute *attr, 
		return -EINVAL;

		return -EINVAL;





	phba->cfg_fcp_imax = (uint32_t)val;

	phba->cfg_fcp_imax = (uint32_t)val;

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



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

		lpfc_modify_hba_eq_delay(phba, i);

		lpfc_modify_hba_eq_delay(phba, i);





	return strlen(buf);

	return strlen(buf);

drivers/scsi/lpfc/lpfc_hw4.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -1001,7 +1001,7 @@ struct eq_delay_info { 
	uint32_t phase;

	uint32_t phase;

	uint32_t delay_multi;

	uint32_t delay_multi;

};

};

#define	LPFC_MAX_EQ_DELAY	8

#define	LPFC_MAX_EQ_DELAY_EQID_CNT	8





struct sgl_page_pairs {

struct sgl_page_pairs {

	uint32_t sgl_pg0_addr_lo;

	uint32_t sgl_pg0_addr_lo;
@@ -1070,7 +1070,7 @@ struct lpfc_mbx_modify_eq_delay { 
	union {

	union {

		struct {

		struct {

			uint32_t num_eq;

			uint32_t num_eq;

			struct eq_delay_info eq[LPFC_MAX_EQ_DELAY];

			struct eq_delay_info eq[LPFC_MAX_EQ_DELAY_EQID_CNT];

		} request;

		} request;

		struct {

		struct {

			uint32_t word0;

			uint32_t word0;

drivers/scsi/lpfc/lpfc_init.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -8756,12 +8756,9 @@ lpfc_sli4_queue_setup(struct lpfc_hba *phba) 
		}

		}

	}

	}





	/*

	for (qidx = 0; qidx < io_channel; qidx += LPFC_MAX_EQ_DELAY_EQID_CNT)

	 * Configure EQ delay multipier for interrupt coalescing using

	 * MODIFY_EQ_DELAY for all EQs created, LPFC_MAX_EQ_DELAY at a time.

	 */

	for (qidx = 0; qidx < io_channel; qidx += LPFC_MAX_EQ_DELAY)

		lpfc_modify_hba_eq_delay(phba, qidx);

		lpfc_modify_hba_eq_delay(phba, qidx);



	return 0;

	return 0;





out_destroy:

out_destroy:

drivers/scsi/lpfc/lpfc_sli.c

+4 −1
Original line number Original line Diff line number Diff line 










/*******************************************************************







/*******************************************************************











 * This file is part of the Emulex Linux Device Driver for         *







 * This file is part of the Emulex Linux Device Driver for         *











 * Fibre Channel Host Bus Adapters.                                *







 * Fibre Channel Host Bus Adapters.                                *










@@ -13874,6 +13875,8 @@ lpfc_dual_chute_pci_bar_map(struct lpfc_hba *phba, uint16_t pci_barset)









 * @startq: The starting FCP EQ to modify







 * @startq: The starting FCP EQ to modify











 *







 *











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







 * 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







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











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







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










@@ -13926,7 +13929,7 @@ lpfc_modify_hba_eq_delay(struct lpfc_hba *phba, uint32_t startq)









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







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











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







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











		cnt++;







		cnt++;











		if (cnt >= LPFC_MAX_EQ_DELAY)







		if (cnt >= LPFC_MAX_EQ_DELAY_EQID_CNT)











			break;







			break;











	}







	}











	eq_delay->u.request.num_eq = cnt;







	eq_delay->u.request.num_eq = cnt;