lpfc 8.3.32: Correct provisioning change failure on local function
Subsystems (2)
PATCH 5/10 lpfc 8.3.32: Correct provisioning change failure on local function
Fixed system held-up when performing resource provsion through same PCI function
Signed-off-by Alex Iannicelli <[email protected]>
Signed-off-by James Smart <[email protected]>
---
lpfc.h | 4 + lpfc_crtn.h | 4 - lpfc_hbadisc.c | 2 lpfc_init.c | 122 ++++++++++++++++++++++++++++++++++++++------------------- lpfc_scsi.c | 2 lpfc_sli.c | 10 +++- 6 files changed, 98 insertions(+), 46 deletions(-)
drivers/scsi/lpfc/lpfc_crtn.h +2 -2
@@ -183,7 +183,7 @@ int lpfc_post_buffer(struct lpfc_hba *,void lpfc_decode_firmware_rev (struct lpfc_hba *,char *,int );int lpfc_online (struct lpfc_hba *);void lpfc_unblock_mgmt_io (struct lpfc_hba *); -void lpfc_offline_prep (struct lpfc_hba *); +void lpfc_offline_prep (struct lpfc_hba *,int );void lpfc_offline (struct lpfc_hba *);void lpfc_reset_hba (struct lpfc_hba *);
@@ -273,7 +273,7 @@ int lpfc_sli_host_down(struct lpfc_vportint lpfc_sli_hba_down (struct lpfc_hba *);int lpfc_sli_issue_mbox (struct lpfc_hba *,LPFC_MBOXQ_t *,uint32_t );int lpfc_sli_handle_mb_event (struct lpfc_hba *); -void lpfc_sli_mbox_sys_shutdown (struct lpfc_hba *); +void lpfc_sli_mbox_sys_shutdown (struct lpfc_hba *,int );int lpfc_sli_check_eratt (struct lpfc_hba *);void lpfc_sli_handle_slow_ring_event (struct lpfc_hba *,struct lpfc_sli_ring *,uint32_t );
drivers/scsi/lpfc/lpfc.h +4 -0
@@ -96,6 +96,10 @@ struct lpfc_sli2_slim;/* queue dump line buffer size */ #define LPFC_LBUF_SZ 128 +/* mailbox system shutdown options */ +#define LPFC_MBX_NO_WAIT 0 +#define LPFC_MBX_WAIT 1 +enum lpfc_polling_flags {ENABLE_FCP_RING_POLLING =0x1 ,DISABLE_FCP_RING_INT =0x2
drivers/scsi/lpfc/lpfc_hbadisc.c +1 -1
@@ -530,7 +530,7 @@ lpfc_work_list_done(struct lpfc_hba *phbbreak ;case LPFC_EVT_OFFLINE_PREP :if (phba->link_state >=LPFC_LINK_DOWN ) -lpfc_offline_prep (phba); +lpfc_offline_prep (phba,LPFC_MBX_WAIT ); *(int *)(evtp->evt_arg1) =0 ;complete ((struct completion *)(evtp->evt_arg2));break ;
drivers/scsi/lpfc/lpfc_init.c +82 -40
244 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_scsi.c +1 -1
@@ -4982,7 +4982,7 @@ lpfc_host_reset_handler(struct scsi_cmndstruct lpfc_hba *phba = vport->phba;int rc, ret =SUCCESS ; -lpfc_offline_prep (phba); +lpfc_offline_prep (phba,LPFC_MBX_WAIT );lpfc_offline (phba); rc =lpfc_sli_brdrestart (phba);if (rc)
drivers/scsi/lpfc/lpfc_sli.c +8 -2
@@ -8984,7 +8984,7 @@ lpfc_sli_hba_down(struct lpfc_hba *phba)int i;/* Shutdown the mailbox command sub-system */ -lpfc_sli_mbox_sys_shutdown (phba); +lpfc_sli_mbox_sys_shutdown (phba,LPFC_MBX_WAIT );lpfc_hba_down_prep (phba);
@@ -9996,11 +9996,17 @@ lpfc_sli_issue_mbox_wait(struct lpfc_hba* sub-system flush routine to gracefully bring down mailbox sub-system. **/ void -lpfc_sli_mbox_sys_shutdown (struct lpfc_hba *phba) +lpfc_sli_mbox_sys_shutdown (struct lpfc_hba *phba,int mbx_action) {struct lpfc_sli *psli = &phba->sli;unsigned long timeout; +if (mbx_action ==LPFC_MBX_NO_WAIT ) { +/* delay 100ms for port state */ +msleep (100 ); +lpfc_sli_mbox_sys_flush (phba); +return ; + } timeout =msecs_to_jiffies (LPFC_MBOX_TMO *1000 ) + jiffies;spin_lock_irq (&phba->hbalock);