[SCSI] bfa: IOC bug fixes.

- Add logic to handle the case where PCI mapping goes away when
  IOCPF state machine is waiting for semaphore.
- Added logic to unlock hw semaphore if the previos FW boot was
  from flash based and the current FW initialization attempt is from OS.
- Added fix to update hbfails and hb_count stats during hwerror event.

Signed-off-by: Krishna Gudipati <kgudipat@brocade.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 10 insertions, 13 deletions

diff --git a/drivers/scsi/bfa/bfa_ioc_ct.c b/drivers/scsi/bfa/bfa_ioc_ct.c
index 5b5579401d43..216016c50d11 100644
--- a/drivers/scsi/bfa/bfa_ioc_ct.c
+++ b/drivers/scsi/bfa/bfa_ioc_ct.c
@@ -58,12 +58,6 @@ bfa_ioc_ct_firmware_lock(struct bfa_ioc_s *ioc)
         struct bfi_ioc_image_hdr_s fwhdr;
 
         /*
-         * Firmware match check is relevant only for CNA.
-         */
-        if (!bfa_ioc_is_cna(ioc))
-                return BFA_TRUE;
-
-        /*
          * If bios boot (flash based) -- do not increment usage count
          */
         if (bfa_cb_image_get_size(bfa_ioc_asic_gen(ioc)) <
@@ -78,6 +72,7 @@ bfa_ioc_ct_firmware_lock(struct bfa_ioc_s *ioc)
          */
         if (usecnt == 0) {
                 writel(1, ioc->ioc_regs.ioc_usage_reg);
+                readl(ioc->ioc_regs.ioc_usage_sem_reg);
                 writel(1, ioc->ioc_regs.ioc_usage_sem_reg);
                 writel(0, ioc->ioc_regs.ioc_fail_sync);
                 bfa_trc(ioc, usecnt);
@@ -97,6 +92,7 @@ bfa_ioc_ct_firmware_lock(struct bfa_ioc_s *ioc)
          */
         bfa_ioc_fwver_get(ioc, &fwhdr);
         if (!bfa_ioc_fwver_cmp(ioc, &fwhdr)) {
+                readl(ioc->ioc_regs.ioc_usage_sem_reg);
                 writel(1, ioc->ioc_regs.ioc_usage_sem_reg);
                 bfa_trc(ioc, usecnt);
                 return BFA_FALSE;
@@ -107,6 +103,7 @@ bfa_ioc_ct_firmware_lock(struct bfa_ioc_s *ioc)
          */
         usecnt++;
         writel(usecnt, ioc->ioc_regs.ioc_usage_reg);
+        readl(ioc->ioc_regs.ioc_usage_sem_reg);
         writel(1, ioc->ioc_regs.ioc_usage_sem_reg);
         bfa_trc(ioc, usecnt);
         return BFA_TRUE;
@@ -118,12 +115,6 @@ bfa_ioc_ct_firmware_unlock(struct bfa_ioc_s *ioc)
         u32 usecnt;
 
         /*
-         * Firmware lock is relevant only for CNA.
-         */
-        if (!bfa_ioc_is_cna(ioc))
-                return;
-
-        /*
          * If bios boot (flash based) -- do not decrement usage count
          */
         if (bfa_cb_image_get_size(bfa_ioc_asic_gen(ioc)) <
@@ -141,6 +132,7 @@ bfa_ioc_ct_firmware_unlock(struct bfa_ioc_s *ioc)
         writel(usecnt, ioc->ioc_regs.ioc_usage_reg);
         bfa_trc(ioc, usecnt);
 
+        readl(ioc->ioc_regs.ioc_usage_sem_reg);
         writel(1, ioc->ioc_regs.ioc_usage_sem_reg);
 }
 
@@ -344,7 +336,11 @@ bfa_ioc_ct_map_port(struct bfa_ioc_s *ioc)
 static void
 bfa_ioc_ct2_map_port(struct bfa_ioc_s *ioc)
 {
-        ioc->port_id = bfa_ioc_pcifn(ioc) % 2;
+        void __iomem    *rb = ioc->pcidev.pci_bar_kva;
+        u32     r32;
+
+        r32 = readl(rb + CT2_HOSTFN_PERSONALITY0);
+        ioc->port_id = ((r32 & __FC_LL_PORT_MAP__MK) >> __FC_LL_PORT_MAP__SH);
 
         bfa_trc(ioc, bfa_ioc_pcifn(ioc));
         bfa_trc(ioc, ioc->port_id);
@@ -407,6 +403,7 @@ bfa_ioc_ct_ownership_reset(struct bfa_ioc_s *ioc)
         if (bfa_ioc_is_cna(ioc)) {
                 bfa_ioc_sem_get(ioc->ioc_regs.ioc_usage_sem_reg);
                 writel(0, ioc->ioc_regs.ioc_usage_reg);
+                readl(ioc->ioc_regs.ioc_usage_sem_reg);
                 writel(1, ioc->ioc_regs.ioc_usage_sem_reg);
         }