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

Commit fe085594 authored by James Smart's avatar James Smart Committed by Greg Kroah-Hartman
Browse files

scsi: lpfc: Allow reduced polling rate for nvme_admin_async_event cmd completion 

[ Upstream commit 2e7e9c0c1ec05f18d320ecc8a31eec59d2af1af9 ]

NVMe Asynchronous Event Request commands have no command timeout value per
specifications.

Set WQE option to allow a reduced FLUSH polling rate for I/O error
detection specifically for nvme_admin_async_event commands.

Link: https://lore.kernel.org/r/20220603174329.63777-9-jsmart2021@gmail.com


Co-developed-by: default avatarJustin Tee <justin.tee@broadcom.com>
Signed-off-by: default avatarJustin Tee <justin.tee@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1f1be791

drivers/scsi/lpfc/lpfc_hw4.h

+3 −0
Original line number Diff line number Diff line
@@ -4249,6 +4249,9 @@ struct wqe_common { 
#define wqe_sup_SHIFT         6

#define wqe_sup_MASK          0x00000001

#define wqe_sup_WORD          word11

#define wqe_ffrq_SHIFT         6

#define wqe_ffrq_MASK          0x00000001

#define wqe_ffrq_WORD          word11

#define wqe_wqec_SHIFT        7

#define wqe_wqec_MASK         0x00000001

#define wqe_wqec_WORD         word11

drivers/scsi/lpfc/lpfc_nvme.c

+9 −2
Original line number Diff line number Diff line
@@ -1202,7 +1202,8 @@ lpfc_nvme_prep_io_cmd(struct lpfc_vport *vport, 
{

	struct lpfc_hba *phba = vport->phba;

	struct nvmefc_fcp_req *nCmd = lpfc_ncmd->nvmeCmd;

	struct lpfc_iocbq *pwqeq = &(lpfc_ncmd->cur_iocbq);

	struct nvme_common_command *sqe;

	struct lpfc_iocbq *pwqeq = &lpfc_ncmd->cur_iocbq;

	union lpfc_wqe128 *wqe = &pwqeq->wqe;

	uint32_t req_len;
@@ -1258,8 +1259,14 @@ lpfc_nvme_prep_io_cmd(struct lpfc_vport *vport, 
		cstat->control_requests++;

	}



	if (pnode->nlp_nvme_info & NLP_NVME_NSLER)

	if (pnode->nlp_nvme_info & NLP_NVME_NSLER) {

		bf_set(wqe_erp, &wqe->generic.wqe_com, 1);

		sqe = &((struct nvme_fc_cmd_iu *)

			nCmd->cmdaddr)->sqe.common;

		if (sqe->opcode == nvme_admin_async_event)

			bf_set(wqe_ffrq, &wqe->generic.wqe_com, 1);

	}



	/*

	 * Finish initializing those WQE fields that are independent

	 * of the nvme_cmnd request_buffer