Merge tag 'bitmap-5.17-rc1' of git://github.com/norov/linux

[linux-2.6-microblaze.git] / drivers / scsi / lpfc / lpfc_sli.c

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 77dfe29..1bc0db5 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -4749,7 +4749,7 @@ void lpfc_reset_barrier(struct lpfc_hba *phba)
 {
        uint32_t __iomem *resp_buf;
        uint32_t __iomem *mbox_buf;
-       volatile uint32_t mbox;
+       volatile struct MAILBOX_word0 mbox;
        uint32_t hc_copy, ha_copy, resp_data;
        int  i;
        uint8_t hdrtype;
@@ -4783,13 +4783,13 @@ void lpfc_reset_barrier(struct lpfc_hba *phba)
                phba->pport->stopped = 1;
        }
 
-       mbox = 0;
-       ((MAILBOX_t *)&mbox)->mbxCommand = MBX_KILL_BOARD;
-       ((MAILBOX_t *)&mbox)->mbxOwner = OWN_CHIP;
+       mbox.word0 = 0;
+       mbox.mbxCommand = MBX_KILL_BOARD;
+       mbox.mbxOwner = OWN_CHIP;
 
        writel(BARRIER_TEST_PATTERN, (resp_buf + 1));
        mbox_buf = phba->MBslimaddr;
-       writel(mbox, mbox_buf);
+       writel(mbox.word0, mbox_buf);
 
        for (i = 0; i < 50; i++) {
                if (lpfc_readl((resp_buf + 1), &resp_data))
@@ -4810,12 +4810,12 @@ void lpfc_reset_barrier(struct lpfc_hba *phba)
                        goto clear_errat;
        }
 
-       ((MAILBOX_t *)&mbox)->mbxOwner = OWN_HOST;
+       mbox.mbxOwner = OWN_HOST;
        resp_data = 0;
        for (i = 0; i < 500; i++) {
                if (lpfc_readl(resp_buf, &resp_data))
                        return;
-               if (resp_data != mbox)
+               if (resp_data != mbox.word0)
                        mdelay(1);
                else
                        break;
@@ -5046,12 +5046,6 @@ lpfc_sli4_brdreset(struct lpfc_hba *phba)
        phba->fcf.fcf_flag = 0;
        spin_unlock_irq(&phba->hbalock);
 
-       /* SLI4 INTF 2: if FW dump is being taken skip INIT_PORT */
-       if (phba->hba_flag & HBA_FW_DUMP_OP) {
-               phba->hba_flag &= ~HBA_FW_DUMP_OP;
-               return rc;
-       }
-
        /* Now physically reset the device */
        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
                        "0389 Performing PCI function reset!\n");
@@ -5091,9 +5085,8 @@ lpfc_sli4_brdreset(struct lpfc_hba *phba)
 static int
 lpfc_sli_brdrestart_s3(struct lpfc_hba *phba)
 {
-       MAILBOX_t *mb;
+       volatile struct MAILBOX_word0 mb;
        struct lpfc_sli *psli;
-       volatile uint32_t word0;
        void __iomem *to_slim;
        uint32_t hba_aer_enabled;
 
@@ -5110,24 +5103,23 @@ lpfc_sli_brdrestart_s3(struct lpfc_hba *phba)
                        (phba->pport) ? phba->pport->port_state : 0,
                        psli->sli_flag);
 
-       word0 = 0;
-       mb = (MAILBOX_t *) &word0;
-       mb->mbxCommand = MBX_RESTART;
-       mb->mbxHc = 1;
+       mb.word0 = 0;
+       mb.mbxCommand = MBX_RESTART;
+       mb.mbxHc = 1;
 
        lpfc_reset_barrier(phba);
 
        to_slim = phba->MBslimaddr;
-       writel(*(uint32_t *) mb, to_slim);
+       writel(mb.word0, to_slim);
        readl(to_slim); /* flush */
 
        /* Only skip post after fc_ffinit is completed */
        if (phba->pport && phba->pport->port_state)
-               word0 = 1;      /* This is really setting up word1 */
+               mb.word0 = 1;   /* This is really setting up word1 */
        else
-               word0 = 0;      /* This is really setting up word1 */
+               mb.word0 = 0;   /* This is really setting up word1 */
        to_slim = phba->MBslimaddr + sizeof (uint32_t);
-       writel(*(uint32_t *) mb, to_slim);
+       writel(mb.word0, to_slim);
        readl(to_slim); /* flush */
 
        lpfc_sli_brdreset(phba);