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

Commit 55d8b650 authored by Dick Kennedy's avatar Dick Kennedy Committed by Greg Kroah-Hartman
Browse files

scsi: lpfc: Fix FCP hba_wqidx assignment 



commit 8e036a9497c5d565baafda4c648f2f372999a547 upstream.

The driver is encountering  oops in lpfc_sli_calc_ring.

The driver is setting hba_wqidx for FCP based on the policy in use for
NVME. The two may not be the same.  Change to set the wqidx based on the
FCP policy.

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 27b1313c

drivers/scsi/lpfc/lpfc_sli.c

+4 −1
Original line number Diff line number Diff line
@@ -9396,10 +9396,13 @@ lpfc_sli4_calc_ring(struct lpfc_hba *phba, struct lpfc_iocbq *piocb) 
			 * for abort iocb hba_wqidx should already

			 * be setup based on what work queue we used.

			 */

			if (!(piocb->iocb_flag & LPFC_USE_FCPWQIDX))

			if (!(piocb->iocb_flag & LPFC_USE_FCPWQIDX)) {

				piocb->hba_wqidx =

					lpfc_sli4_scmd_to_wqidx_distr(phba,

							      piocb->context1);

				piocb->hba_wqidx = piocb->hba_wqidx %

					phba->cfg_fcp_io_channel;

			}

			return phba->sli4_hba.fcp_wq[piocb->hba_wqidx]->pring;

		} else {

			if (unlikely(!phba->sli4_hba.oas_wq))