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

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

[SCSI] lpfc 8.3.38: Fixed NMI watch dog panic's when resetting the hba. 



Fixed NMI watch dog panic's when resetting the hba.

Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent d4a2618f

drivers/scsi/lpfc/lpfc_attr.c

+1 −1
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ lpfc_do_offline(struct lpfc_hba *phba, uint32_t type) 
	 */

	for (i = 0; i < psli->num_rings; i++) {

		pring = &psli->ring[i];

		while (pring->txcmplq_cnt) {

		while (!list_empty(&pring->txcmplq)) {

			msleep(10);

			if (cnt++ > 500) {  /* 5 secs */

				lpfc_printf_log(phba,

drivers/scsi/lpfc/lpfc_bsg.c

+1 −1
Original line number Diff line number Diff line
@@ -1559,7 +1559,7 @@ lpfc_bsg_diag_mode_enter(struct lpfc_hba *phba) 
		scsi_block_requests(shost);

	}



	while (pring->txcmplq_cnt) {

	while (!list_empty(&pring->txcmplq)) {

		if (i++ > 500)  /* wait up to 5 seconds */

			break;

		msleep(10);

drivers/scsi/lpfc/lpfc_els.c

+2 −4
Original line number Diff line number Diff line
@@ -6225,7 +6225,7 @@ lpfc_els_timeout_handler(struct lpfc_vport *vport) 
		spin_unlock_irq(&phba->hbalock);

	}



	if (phba->sli.ring[LPFC_ELS_RING].txcmplq_cnt)

	if (!list_empty(&phba->sli.ring[LPFC_ELS_RING].txcmplq))

		mod_timer(&vport->els_tmofunc, jiffies + HZ * timeout);

}
@@ -6279,7 +6279,6 @@ lpfc_els_flush_cmd(struct lpfc_vport *vport) 
			continue;



		list_move_tail(&piocb->list, &completions);

		pring->txq_cnt--;

	}



	list_for_each_entry_safe(piocb, tmp_iocb, &pring->txcmplq, list) {
@@ -6339,7 +6338,6 @@ lpfc_els_flush_all_cmd(struct lpfc_hba *phba) 
		    cmd->ulpCommand == CMD_ABORT_XRI_CN)

			continue;

		list_move_tail(&piocb->list, &completions);

		pring->txq_cnt--;

	}

	list_for_each_entry_safe(piocb, tmp_iocb, &pring->txcmplq, list) {

		if (piocb->iocb_flag & LPFC_IO_LIBDFC)
@@ -8065,7 +8063,7 @@ lpfc_sli4_els_xri_aborted(struct lpfc_hba *phba, 
				rxid, 1);



			/* Check if TXQ queue needs to be serviced */

			if (pring->txq_cnt)

			if (!(list_empty(&pring->txq)))

				lpfc_worker_wake_up(phba);

			return;

		}

drivers/scsi/lpfc/lpfc_hbadisc.c

+2 −3
Original line number Diff line number Diff line
@@ -696,7 +696,8 @@ lpfc_work_done(struct lpfc_hba *phba) 
							(status &

							 HA_RXMASK));

		}

		if ((phba->sli_rev == LPFC_SLI_REV4) && pring->txq_cnt)

		if ((phba->sli_rev == LPFC_SLI_REV4) &

				 (!list_empty(&pring->txq)))

			lpfc_drain_txq(phba);

		/*

		 * Turn on Ring interrupts
@@ -4354,7 +4355,6 @@ lpfc_no_rpi(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp) 
					   with an error */

					list_move_tail(&iocb->list,

						       &completions);

					pring->txq_cnt--;

				}

			}

			spin_unlock_irq(&phba->hbalock);
@@ -5055,7 +5055,6 @@ lpfc_free_tx(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp) 
		    (icmd->ulpCommand == CMD_XMIT_ELS_RSP64_CX)) {



			list_move_tail(&iocb->list, &completions);

			pring->txq_cnt--;

		}

	}

drivers/scsi/lpfc/lpfc_init.c

+0 −1
Original line number Diff line number Diff line
@@ -839,7 +839,6 @@ lpfc_hba_down_post_s3(struct lpfc_hba *phba) 
		 * way, nothing should be on txcmplq as it will NEVER complete.

		 */

		list_splice_init(&pring->txcmplq, &completions);

		pring->txcmplq_cnt = 0;

		spin_unlock_irq(&phba->hbalock);



		/* Cancel all the IOCBs from the completions list */