diff options
| author |   Krishna Gudipati <kgudipat@brocade.com> | 2010-03-05 19:36:56 -0800 |
|---|---|---|
| committer |   James Bottomley <James.Bottomley@suse.de> | 2010-03-07 13:01:42 +0530 |
| commit | 816e49b8ed209e5e08d4c43359635cbca17e7196 (patch) | |
| tree | 4e76c1555c8df9b37a50d11f6c50c76d447e84a9 /drivers/scsi/bfa/bfa_ioc_ct.c | |
| parent | [SCSI] bfa: AEN and byte alignment fixes. (diff) | |
| download | linux-dev-816e49b8ed209e5e08d4c43359635cbca17e7196.tar.xz linux-dev-816e49b8ed209e5e08d4c43359635cbca17e7196.zip | |
[SCSI] bfa: IOC recovery fix in fcmode.
ioc_recover failed to work in fcmode.
Fixed the code to initialize the ioc_regs.err_set during the
notify_hbfail.
Signed-off-by: Krishna Gudipati <kgudipat@brocade.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/bfa/bfa_ioc_ct.c')
| -rw-r--r-- | drivers/scsi/bfa/bfa_ioc_ct.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/scsi/bfa/bfa_ioc_ct.c b/drivers/scsi/bfa/bfa_ioc_ct.c index 0430edd2e011..469da95aedf3 100644 --- a/drivers/scsi/bfa/bfa_ioc_ct.c +++ b/drivers/scsi/bfa/bfa_ioc_ct.c @@ -171,10 +171,14 @@ bfa_ioc_ct_firmware_unlock(struct bfa_ioc_s *ioc) static void bfa_ioc_ct_notify_hbfail(struct bfa_ioc_s *ioc) { - - bfa_reg_write(ioc->ioc_regs.ll_halt, __FW_INIT_HALT_P); - /* Wait for halt to take effect */ - bfa_reg_read(ioc->ioc_regs.ll_halt); + if (ioc->cna) { + bfa_reg_write(ioc->ioc_regs.ll_halt, __FW_INIT_HALT_P); + /* Wait for halt to take effect */ + bfa_reg_read(ioc->ioc_regs.ll_halt); + } else { + bfa_reg_write(ioc->ioc_regs.err_set, __PSS_ERR_STATUS_SET); + bfa_reg_read(ioc->ioc_regs.err_set); + } } /** @@ -254,6 +258,11 @@ bfa_ioc_ct_reg_init(struct bfa_ioc_s *ioc) */ ioc->ioc_regs.smem_page_start = (rb + PSS_SMEM_PAGE_START); ioc->ioc_regs.smem_pg0 = BFI_IOC_SMEM_PG0_CT; + + /* + * err set reg : for notification of hb failure in fcmode + */ + ioc->ioc_regs.err_set = (rb + ERR_SET_REG); } /** |