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

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

[SCSI] lpfc 8.3.27: Changed worst case mailbox timeout 



Changed the timeout value for flash-based SLI_CONFIG (0x9B)
mailbox command to 300 seconds for worst case flash delays.

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 73d91e50

drivers/scsi/lpfc/lpfc_attr.c

+7 −5
Original line number Diff line number Diff line
@@ -4113,8 +4113,10 @@ sysfs_mbox_read(struct file *filp, struct kobject *kobj, 
	struct Scsi_Host  *shost = class_to_shost(dev);

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

	struct lpfc_hba   *phba = vport->phba;

	int rc;

	LPFC_MBOXQ_t *mboxq;

	MAILBOX_t *pmb;

	uint32_t mbox_tmo;

	int rc;



	if (off > MAILBOX_CMD_SIZE)

		return -ERANGE;
@@ -4139,7 +4141,8 @@ sysfs_mbox_read(struct file *filp, struct kobject *kobj, 
	if (off == 0 &&

	    phba->sysfs_mbox.state  == SMBOX_WRITING &&

	    phba->sysfs_mbox.offset >= 2 * sizeof(uint32_t)) {

		pmb = &phba->sysfs_mbox.mbox->u.mb;

		mboxq = (LPFC_MBOXQ_t *)&phba->sysfs_mbox.mbox;

		pmb = &mboxq->u.mb;

		switch (pmb->mbxCommand) {

			/* Offline only */

		case MBX_INIT_LINK:
@@ -4249,9 +4252,8 @@ sysfs_mbox_read(struct file *filp, struct kobject *kobj, 


		} else {

			spin_unlock_irq(&phba->hbalock);

			rc = lpfc_sli_issue_mbox_wait (phba,

						       phba->sysfs_mbox.mbox,

				lpfc_mbox_tmo_val(phba, pmb->mbxCommand) * HZ);

			mbox_tmo = lpfc_mbox_tmo_val(phba, mboxq);

			rc = lpfc_sli_issue_mbox_wait(phba, mboxq, mbox_tmo);

			spin_lock_irq(&phba->hbalock);

		}

drivers/scsi/lpfc/lpfc_crtn.h

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ void __lpfc_mbox_cmpl_put(struct lpfc_hba *, LPFC_MBOXQ_t *); 
void lpfc_mbox_cmpl_put(struct lpfc_hba *, LPFC_MBOXQ_t *);

int lpfc_mbox_cmd_check(struct lpfc_hba *, LPFC_MBOXQ_t *);

int lpfc_mbox_dev_check(struct lpfc_hba *);

int lpfc_mbox_tmo_val(struct lpfc_hba *, int);

int lpfc_mbox_tmo_val(struct lpfc_hba *, LPFC_MBOXQ_t *);

void lpfc_init_vfi(struct lpfcMboxq *, struct lpfc_vport *);

void lpfc_reg_vfi(struct lpfcMboxq *, struct lpfc_vport *, dma_addr_t);

void lpfc_init_vpi(struct lpfc_hba *, struct lpfcMboxq *, uint16_t);

drivers/scsi/lpfc/lpfc_hw4.h

+29 −19
Original line number Diff line number Diff line
@@ -826,6 +826,7 @@ struct mbox_header { 
#define LPFC_EXTENT_VERSION_DEFAULT	0



/* Subsystem Definitions */

#define LPFC_MBOX_SUBSYSTEM_NA		0x0

#define LPFC_MBOX_SUBSYSTEM_COMMON	0x1

#define LPFC_MBOX_SUBSYSTEM_FCOE	0xC
@@ -836,6 +837,7 @@ struct mbox_header { 
#define HOST_ENDIAN_HIGH_WORD1	0xFF7856FF



/* Common Opcodes */

#define LPFC_MBOX_OPCODE_NA				0x00

#define LPFC_MBOX_OPCODE_CQ_CREATE			0x0C

#define LPFC_MBOX_OPCODE_EQ_CREATE			0x0D

#define LPFC_MBOX_OPCODE_MQ_CREATE			0x15
@@ -853,7 +855,14 @@ struct mbox_header { 
#define LPFC_MBOX_OPCODE_DEALLOC_RSRC_EXTENT		0x9D

#define LPFC_MBOX_OPCODE_GET_FUNCTION_CONFIG		0xA0

#define LPFC_MBOX_OPCODE_GET_PROFILE_CONFIG		0xA4

#define LPFC_MBOX_OPCODE_SET_PROFILE_CONFIG		0xA5

#define LPFC_MBOX_OPCODE_GET_PROFILE_LIST		0xA6

#define LPFC_MBOX_OPCODE_SET_ACT_PROFILE		0xA8

#define LPFC_MBOX_OPCODE_GET_FACTORY_PROFILE_CONFIG	0xA9

#define LPFC_MBOX_OPCODE_READ_OBJECT			0xAB

#define LPFC_MBOX_OPCODE_WRITE_OBJECT			0xAC

#define LPFC_MBOX_OPCODE_READ_OBJECT_LIST		0xAD

#define LPFC_MBOX_OPCODE_DELETE_OBJECT			0xAE

#define LPFC_MBOX_OPCODE_GET_SLI4_PARAMETERS		0xB5



/* FCoE Opcodes */
@@ -868,6 +877,7 @@ struct mbox_header { 
#define LPFC_MBOX_OPCODE_FCOE_DELETE_FCF		0x0A

#define LPFC_MBOX_OPCODE_FCOE_POST_HDR_TEMPLATE		0x0B

#define LPFC_MBOX_OPCODE_FCOE_REDISCOVER_FCF		0x10

#define LPFC_MBOX_OPCODE_FCOE_SET_FCLINK_SETTINGS	0x21

#define LPFC_MBOX_OPCODE_FCOE_LINK_DIAG_STATE		0x22

#define LPFC_MBOX_OPCODE_FCOE_LINK_DIAG_LOOPBACK	0x23

drivers/scsi/lpfc/lpfc_init.c

+18 −13
Original line number Diff line number Diff line
@@ -2441,17 +2441,19 @@ lpfc_block_mgmt_io(struct lpfc_hba * phba) 
	uint8_t actcmd = MBX_HEARTBEAT;

	unsigned long timeout;





	timeout = msecs_to_jiffies(LPFC_MBOX_TMO * 1000) + jiffies;

	spin_lock_irqsave(&phba->hbalock, iflag);

	phba->sli.sli_flag |= LPFC_BLOCK_MGMT_IO;

	if (phba->sli.mbox_active)

	if (phba->sli.mbox_active) {

		actcmd = phba->sli.mbox_active->u.mb.mbxCommand;

	spin_unlock_irqrestore(&phba->hbalock, iflag);

		/* Determine how long we might wait for the active mailbox

		 * command to be gracefully completed by firmware.

		 */

	timeout = msecs_to_jiffies(lpfc_mbox_tmo_val(phba, actcmd) * 1000) +

			jiffies;

		timeout = msecs_to_jiffies(lpfc_mbox_tmo_val(phba,

				phba->sli.mbox_active) * 1000) + jiffies;

	}

	spin_unlock_irqrestore(&phba->hbalock, iflag);



	/* Wait for the outstnading mailbox command to complete */

	while (phba->sli.mbox_active) {

		/* Check active mailbox complete status every 2ms */
@@ -7158,12 +7160,13 @@ lpfc_sli4_send_nop_mbox_cmds(struct lpfc_hba *phba, uint32_t cnt) 
	lpfc_sli4_config(phba, mboxq, LPFC_MBOX_SUBSYSTEM_COMMON,

			 LPFC_MBOX_OPCODE_NOP, length, LPFC_SLI4_MBX_EMBED);



	mbox_tmo = lpfc_mbox_tmo_val(phba, MBX_SLI4_CONFIG);

	for (cmdsent = 0; cmdsent < cnt; cmdsent++) {

		if (!phba->sli4_hba.intr_enable)

			rc = lpfc_sli_issue_mbox(phba, mboxq, MBX_POLL);

		else

		else {

			mbox_tmo = lpfc_mbox_tmo_val(phba, mboxq);

			rc = lpfc_sli_issue_mbox_wait(phba, mboxq, mbox_tmo);

		}

		if (rc == MBX_TIMEOUT)

			break;

		/* Check return status */
@@ -8129,7 +8132,7 @@ lpfc_pc_sli4_params_get(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq) 
	if (!phba->sli4_hba.intr_enable)

		rc = lpfc_sli_issue_mbox(phba, mboxq, MBX_POLL);

	else {

		mbox_tmo = lpfc_mbox_tmo_val(phba, MBX_PORT_CAPABILITIES);

		mbox_tmo = lpfc_mbox_tmo_val(phba, mboxq);

		rc = lpfc_sli_issue_mbox_wait(phba, mboxq, mbox_tmo);

	}
@@ -8191,6 +8194,7 @@ lpfc_get_sli4_parameters(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq) 
	int rc;

	struct lpfc_mqe *mqe = &mboxq->u.mqe;

	struct lpfc_pc_sli4_params *sli4_params;

	uint32_t mbox_tmo;

	int length;

	struct lpfc_sli4_parameters *mbx_sli4_parameters;
@@ -8209,9 +8213,10 @@ lpfc_get_sli4_parameters(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq) 
			 length, LPFC_SLI4_MBX_EMBED);

	if (!phba->sli4_hba.intr_enable)

		rc = lpfc_sli_issue_mbox(phba, mboxq, MBX_POLL);

	else

		rc = lpfc_sli_issue_mbox_wait(phba, mboxq,

			lpfc_mbox_tmo_val(phba, MBX_SLI4_CONFIG));

	else {

		mbox_tmo = lpfc_mbox_tmo_val(phba, mboxq);

		rc = lpfc_sli_issue_mbox_wait(phba, mboxq, mbox_tmo);

	}

	if (unlikely(rc))

		return rc;

	sli4_params = &phba->sli4_hba.pc_sli4_params;

drivers/scsi/lpfc/lpfc_mbox.c

+69 −11
Original line number Diff line number Diff line
@@ -1598,9 +1598,12 @@ lpfc_mbox_dev_check(struct lpfc_hba *phba) 
 *    Timeout value to be used for the given mailbox command

 **/

int

lpfc_mbox_tmo_val(struct lpfc_hba *phba, int cmd)

lpfc_mbox_tmo_val(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)

{

	switch (cmd) {

	MAILBOX_t *mbox = &mboxq->u.mb;

	uint8_t subsys, opcode;



	switch (mbox->mbxCommand) {

	case MBX_WRITE_NV:	/* 0x03 */

	case MBX_UPDATE_CFG:	/* 0x1B */

	case MBX_DOWN_LOAD:	/* 0x1C */
@@ -1610,6 +1613,28 @@ lpfc_mbox_tmo_val(struct lpfc_hba *phba, int cmd) 
	case MBX_LOAD_EXP_ROM:	/* 0x9C */

		return LPFC_MBOX_TMO_FLASH_CMD;

	case MBX_SLI4_CONFIG:	/* 0x9b */

		subsys = lpfc_sli_config_mbox_subsys_get(phba, mboxq);

		opcode = lpfc_sli_config_mbox_opcode_get(phba, mboxq);

		if (subsys == LPFC_MBOX_SUBSYSTEM_COMMON) {

			switch (opcode) {

			case LPFC_MBOX_OPCODE_READ_OBJECT:

			case LPFC_MBOX_OPCODE_WRITE_OBJECT:

			case LPFC_MBOX_OPCODE_READ_OBJECT_LIST:

			case LPFC_MBOX_OPCODE_DELETE_OBJECT:

			case LPFC_MBOX_OPCODE_GET_FUNCTION_CONFIG:

			case LPFC_MBOX_OPCODE_GET_PROFILE_LIST:

			case LPFC_MBOX_OPCODE_SET_ACT_PROFILE:

			case LPFC_MBOX_OPCODE_SET_PROFILE_CONFIG:

			case LPFC_MBOX_OPCODE_GET_FACTORY_PROFILE_CONFIG:

				return LPFC_MBOX_SLI4_CONFIG_EXTENDED_TMO;

			}

		}

		if (subsys == LPFC_MBOX_SUBSYSTEM_FCOE) {

			switch (opcode) {

			case LPFC_MBOX_OPCODE_FCOE_SET_FCLINK_SETTINGS:

				return LPFC_MBOX_SLI4_CONFIG_EXTENDED_TMO;

			}

		}

		return LPFC_MBOX_SLI4_CONFIG_TMO;

	}

	return LPFC_MBOX_TMO;
@@ -1859,7 +1884,7 @@ lpfc_sli4_mbox_rsrc_extent(struct lpfc_hba *phba, struct lpfcMboxq *mbox, 
	}



	/* Complete the initialization for the particular Opcode. */

	opcode = lpfc_sli4_mbox_opcode_get(phba, mbox);

	opcode = lpfc_sli_config_mbox_opcode_get(phba, mbox);

	switch (opcode) {

	case LPFC_MBOX_OPCODE_ALLOC_RSRC_EXTENT:

		if (emb == LPFC_SLI4_MBX_EMBED)
@@ -1886,23 +1911,56 @@ lpfc_sli4_mbox_rsrc_extent(struct lpfc_hba *phba, struct lpfcMboxq *mbox, 
}



/**

 * lpfc_sli4_mbox_opcode_get - Get the opcode from a sli4 mailbox command

 * lpfc_sli_config_mbox_subsys_get - Get subsystem from a sli_config mbox cmd

 * @phba: pointer to lpfc hba data structure.

 * @mbox: pointer to lpfc mbox command.

 * @mbox: pointer to lpfc mbox command queue entry.

 *

 * This routine gets the subsystem from a SLI4 specific SLI_CONFIG mailbox

 * command. If the mailbox command is not MBX_SLI4_CONFIG (0x9B) or if the

 * sub-header is not present, subsystem LPFC_MBOX_SUBSYSTEM_NA (0x0) shall

 * be returned.

 **/

uint8_t

lpfc_sli_config_mbox_subsys_get(struct lpfc_hba *phba, LPFC_MBOXQ_t *mbox)

{

	struct lpfc_mbx_sli4_config *sli4_cfg;

	union lpfc_sli4_cfg_shdr *cfg_shdr;



	if (mbox->u.mb.mbxCommand != MBX_SLI4_CONFIG)

		return LPFC_MBOX_SUBSYSTEM_NA;

	sli4_cfg = &mbox->u.mqe.un.sli4_config;



	/* For embedded mbox command, get opcode from embedded sub-header*/

	if (bf_get(lpfc_mbox_hdr_emb, &sli4_cfg->header.cfg_mhdr)) {

		cfg_shdr = &mbox->u.mqe.un.sli4_config.header.cfg_shdr;

		return bf_get(lpfc_mbox_hdr_subsystem, &cfg_shdr->request);

	}



	/* For non-embedded mbox command, get opcode from first dma page */

	if (unlikely(!mbox->sge_array))

		return LPFC_MBOX_SUBSYSTEM_NA;

	cfg_shdr = (union lpfc_sli4_cfg_shdr *)mbox->sge_array->addr[0];

	return bf_get(lpfc_mbox_hdr_subsystem, &cfg_shdr->request);

}



/**

 * lpfc_sli_config_mbox_opcode_get - Get opcode from a sli_config mbox cmd

 * @phba: pointer to lpfc hba data structure.

 * @mbox: pointer to lpfc mbox command queue entry.

 *

 * This routine gets the opcode from a SLI4 specific mailbox command for

 * sending IOCTL command. If the mailbox command is not MBX_SLI4_CONFIG

 * (0x9B) or if the IOCTL sub-header is not present, opcode 0x0 shall be

 * This routine gets the opcode from a SLI4 specific SLI_CONFIG mailbox

 * command. If the mailbox command is not MBX_SLI4_CONFIG (0x9B) or if

 * the sub-header is not present, opcode LPFC_MBOX_OPCODE_NA (0x0) be

 * returned.

 **/

uint8_t

lpfc_sli4_mbox_opcode_get(struct lpfc_hba *phba, struct lpfcMboxq *mbox)

lpfc_sli_config_mbox_opcode_get(struct lpfc_hba *phba, LPFC_MBOXQ_t *mbox)

{

	struct lpfc_mbx_sli4_config *sli4_cfg;

	union lpfc_sli4_cfg_shdr *cfg_shdr;



	if (mbox->u.mb.mbxCommand != MBX_SLI4_CONFIG)

		return 0;

		return LPFC_MBOX_OPCODE_NA;

	sli4_cfg = &mbox->u.mqe.un.sli4_config;



	/* For embedded mbox command, get opcode from embedded sub-header*/
@@ -1913,7 +1971,7 @@ lpfc_sli4_mbox_opcode_get(struct lpfc_hba *phba, struct lpfcMboxq *mbox) 


	/* For non-embedded mbox command, get opcode from first dma page */

	if (unlikely(!mbox->sge_array))

		return 0;

		return LPFC_MBOX_OPCODE_NA;

	cfg_shdr = (union lpfc_sli4_cfg_shdr *)mbox->sge_array->addr[0];

	return bf_get(lpfc_mbox_hdr_opcode, &cfg_shdr->request);

}