diff options
Diffstat (limited to 'drivers/scsi/bfa/bfa_ioc_cb.c')
-rw-r--r-- | drivers/scsi/bfa/bfa_ioc_cb.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/bfa/bfa_ioc_cb.c b/drivers/scsi/bfa/bfa_ioc_cb.c index 788ecca5aa01..e4a0713185b6 100644 --- a/drivers/scsi/bfa/bfa_ioc_cb.c +++ b/drivers/scsi/bfa/bfa_ioc_cb.c | |||
@@ -61,7 +61,7 @@ bfa_ioc_set_cb_hwif(struct bfa_ioc_s *ioc) | |||
61 | ioc->ioc_hwif = &hwif_cb; | 61 | ioc->ioc_hwif = &hwif_cb; |
62 | } | 62 | } |
63 | 63 | ||
64 | /** | 64 | /* |
65 | * Return true if firmware of current driver matches the running firmware. | 65 | * Return true if firmware of current driver matches the running firmware. |
66 | */ | 66 | */ |
67 | static bfa_boolean_t | 67 | static bfa_boolean_t |
@@ -70,8 +70,7 @@ bfa_ioc_cb_firmware_lock(struct bfa_ioc_s *ioc) | |||
70 | struct bfi_ioc_image_hdr_s fwhdr; | 70 | struct bfi_ioc_image_hdr_s fwhdr; |
71 | uint32_t fwstate = readl(ioc->ioc_regs.ioc_fwstate); | 71 | uint32_t fwstate = readl(ioc->ioc_regs.ioc_fwstate); |
72 | 72 | ||
73 | if ((fwstate == BFI_IOC_UNINIT) || bfa_ioc_is_uefi(ioc) || | 73 | if (fwstate == BFI_IOC_UNINIT) |
74 | bfa_ioc_is_bios_optrom(ioc)) | ||
75 | return BFA_TRUE; | 74 | return BFA_TRUE; |
76 | 75 | ||
77 | bfa_ioc_fwver_get(ioc, &fwhdr); | 76 | bfa_ioc_fwver_get(ioc, &fwhdr); |
@@ -211,7 +210,7 @@ bfa_ioc_cb_ownership_reset(struct bfa_ioc_s *ioc) | |||
211 | writel(1, ioc->ioc_regs.ioc_sem_reg); | 210 | writel(1, ioc->ioc_regs.ioc_sem_reg); |
212 | } | 211 | } |
213 | 212 | ||
214 | /** | 213 | /* |
215 | * Synchronized IOC failure processing routines | 214 | * Synchronized IOC failure processing routines |
216 | */ | 215 | */ |
217 | static void | 216 | static void |
@@ -236,7 +235,7 @@ bfa_ioc_cb_sync_complete(struct bfa_ioc_s *ioc) | |||
236 | uint32_t fwstate, alt_fwstate; | 235 | uint32_t fwstate, alt_fwstate; |
237 | fwstate = readl(ioc->ioc_regs.ioc_fwstate); | 236 | fwstate = readl(ioc->ioc_regs.ioc_fwstate); |
238 | 237 | ||
239 | /** | 238 | /* |
240 | * At this point, this IOC is hoding the hw sem in the | 239 | * At this point, this IOC is hoding the hw sem in the |
241 | * start path (fwcheck) OR in the disable/enable path | 240 | * start path (fwcheck) OR in the disable/enable path |
242 | * OR to check if the other IOC has acknowledged failure. | 241 | * OR to check if the other IOC has acknowledged failure. |