[SCSI] lpfc 8.1.4 : Introduce lpfc_reset_barrier() function for resets on dual channel adapters

Introduce lpfc_reset_barrier() function for resets on dual channel adapters

Workaround for a hardware errata on dual channel asics. There is a
potential for the chip to lock up on a reset if a shared dma engine is in
use. The (ugly) work around requires a reset process which uses a mailbox
command to synchronize the independent channels prior to the reset to
avoid the issue. Unfortunately, the timing windows required to ensure this
workaround succeeds are very specific, meaning we can't release the cpu
during the barrier.

Signed-off-by: James Smart <James.Smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index a2e15436730e..66d5d003555d 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -464,8 +464,6 @@ lpfc_hba_down_prep(struct lpfc_hba * phba)
         lpfc_els_flush_cmd(phba);
         lpfc_disc_flush_list(phba);
 
-        /* Disable SLI2 since we disabled interrupts */
-        phba->sli.sli_flag &= ~LPFC_SLI2_ACTIVE;
         return (0);
 }
 
@@ -526,6 +524,7 @@ lpfc_handle_eratt(struct lpfc_hba * phba)
                                 phba->work_status[0], phba->work_status[1]);
                 spin_lock_irq(phba->host->host_lock);
                 phba->fc_flag |= FC_ESTABLISH_LINK;
+                psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
                 spin_unlock_irq(phba->host->host_lock);
 
                 /*
@@ -559,6 +558,7 @@ lpfc_handle_eratt(struct lpfc_hba * phba)
                                 phba->brd_no, phba->work_hs,
                                 phba->work_status[0], phba->work_status[1]);
 
+                psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
                 lpfc_offline(phba);
                 phba->hba_state = LPFC_HBA_ERROR;
                 lpfc_hba_down_post(phba);