redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[SCSI] lpfc 8.3.30: Fixed the system panic during EEH recovery

Browse source 
Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
James Smart 2012-03-01 22:36:29 -05:00 committed by James Bottomley
parent 0a8a86facf
commit d7069f0988
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/scsi/lpfc/lpfc_sli.c
View file

@ -7252,11 +7252,13 @@ lpfc_sli4_post_async_mbox(struct lpfc_hba *phba)
out_not_finished: out_not_finished:
spin_lock_irqsave(&phba->hbalock, iflags); spin_lock_irqsave(&phba->hbalock, iflags);
mboxq->u.mb.mbxStatus = MBX_NOT_FINISHED; if (phba->sli.mbox_active) {
__lpfc_mbox_cmpl_put(phba, mboxq); mboxq->u.mb.mbxStatus = MBX_NOT_FINISHED;
/* Release the token */ __lpfc_mbox_cmpl_put(phba, mboxq);
psli->sli_flag &= ~LPFC_SLI_MBOX_ACTIVE; /* Release the token */
phba->sli.mbox_active = NULL; psli->sli_flag &= ~LPFC_SLI_MBOX_ACTIVE;
phba->sli.mbox_active = NULL;
}
spin_unlock_irqrestore(&phba->hbalock, iflags); spin_unlock_irqrestore(&phba->hbalock, iflags);
return MBX_NOT_FINISHED; return MBX_NOT_FINISHED;
@ -9818,12 +9820,11 @@ lpfc_sli_mbox_sys_shutdown(struct lpfc_hba *phba)
unsigned long timeout; unsigned long timeout;
timeout = msecs_to_jiffies(LPFC_MBOX_TMO * 1000) + jiffies; timeout = msecs_to_jiffies(LPFC_MBOX_TMO * 1000) + jiffies;
spin_lock_irq(&phba->hbalock); spin_lock_irq(&phba->hbalock);
psli->sli_flag |= LPFC_SLI_ASYNC_MBX_BLK; psli->sli_flag |= LPFC_SLI_ASYNC_MBX_BLK;
spin_unlock_irq(&phba->hbalock);
if (psli->sli_flag & LPFC_SLI_ACTIVE) { if (psli->sli_flag & LPFC_SLI_ACTIVE) {
spin_lock_irq(&phba->hbalock);
/* Determine how long we might wait for the active mailbox /* Determine how long we might wait for the active mailbox
* command to be gracefully completed by firmware. * command to be gracefully completed by firmware.
*/ */
@ -9842,7 +9843,9 @@ lpfc_sli_mbox_sys_shutdown(struct lpfc_hba *phba)
*/ */
break; break;
} }
} } else
spin_unlock_irq(&phba->hbalock);
lpfc_sli_mbox_sys_flush(phba); lpfc_sli_mbox_sys_flush(phba);
} }