Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a20de44 authored by Krishna Gudipati's avatar Krishna Gudipati Committed by James Bottomley
Browse files

[SCSI] bfa: IOC changes: Support faster recovery and split bfa_ioc.c into ASIC specific code. 



Add support for faster IOC recovery after failure.

Split bfa_ioc.c into three files:
  bfa_ioc.c:    Common code shared between crossbow and catapult ASIC's.

  bfa_ioc_cb.c: Code specific to the crossbow, reg mapping and
                interrupt related routines.

  bfa_ioc_ct.c: Code specific to the catapult, reg mapping and
                interrupt related routines.

Fix to make sure IOC reinitialize's properly on enable request -
update the ioc_fwstate reg with BFI_IOC_FAIL on ioc disable mbox cmd
timeout.

Makefile changes to support the 2 newly added files bfa_ioc_cb.c and
bfa_ioc_ct.c.

Signed-off-by: default avatarKrishna Gudipati <kgudipat@brocade.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent e6714324

drivers/scsi/bfa/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ obj-$(CONFIG_SCSI_BFA_FC) := bfa.o 


bfa-y := bfad.o bfad_intr.o bfad_os.o bfad_im.o bfad_attr.o bfad_fwimg.o



bfa-y += bfa_core.o bfa_ioc.o bfa_iocfc.o bfa_fcxp.o bfa_lps.o

bfa-y += bfa_hw_cb.o bfa_hw_ct.o bfa_intr.o bfa_timer.o bfa_rport.o 

bfa-y += bfa_core.o bfa_ioc.o bfa_ioc_ct.o bfa_ioc_cb.o bfa_iocfc.o bfa_fcxp.o

bfa-y += bfa_lps.o bfa_hw_cb.o bfa_hw_ct.o bfa_intr.o bfa_timer.o bfa_rport.o

bfa-y += bfa_fcport.o bfa_port.o bfa_uf.o bfa_sgpg.o bfa_module.o bfa_ioim.o

bfa-y += bfa_itnim.o bfa_fcpim.o bfa_tskim.o bfa_log.o bfa_log_module.o

bfa-y += bfa_csdebug.o bfa_sm.o plog.o
@@ -12,4 +12,4 @@ bfa-y += fcbuild.o fabric.o fcpim.o vfapi.o fcptm.o bfa_fcs.o bfa_fcs_port.o 
bfa-y += bfa_fcs_uf.o bfa_fcs_lport.o fab.o fdmi.o ms.o ns.o scn.o loop.o

bfa-y += lport_api.o n2n.o rport.o rport_api.o rport_ftrs.o vport.o



ccflags-y := -I$(obj) -I$(obj)/include -I$(obj)/include/cna
 
ccflags-y := -I$(obj) -I$(obj)/include -I$(obj)/include/cna -DBFA_PERF_BUILD

drivers/scsi/bfa/bfa_core.c

+10 −0
Original line number Diff line number Diff line
@@ -399,4 +399,14 @@ bfa_debug_fwtrc(struct bfa_s *bfa, void *trcdata, int *trclen) 
{

	return bfa_ioc_debug_fwtrc(&bfa->ioc, trcdata, trclen);

}



/**

 * Reset hw semaphore & usage cnt regs and initialize.

 */

void

bfa_chip_reset(struct bfa_s *bfa)

{

	bfa_ioc_ownership_reset(&bfa->ioc);

	bfa_ioc_pll_init(&bfa->ioc);

}

#endif

drivers/scsi/bfa/bfa_ioc.c

+97 −449

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/bfa/bfa_ioc.h

+42 −3
Original line number Diff line number Diff line
@@ -78,11 +78,13 @@ struct bfa_ioc_regs_s { 
	bfa_os_addr_t   app_pll_slow_ctl_reg;

	bfa_os_addr_t   ioc_sem_reg;

	bfa_os_addr_t   ioc_usage_sem_reg;

	bfa_os_addr_t   ioc_init_sem_reg;

	bfa_os_addr_t   ioc_usage_reg;

	bfa_os_addr_t   host_page_num_fn;

	bfa_os_addr_t   heartbeat;

	bfa_os_addr_t   ioc_fwstate;

	bfa_os_addr_t   ll_halt;

	bfa_os_addr_t   err_set;

	bfa_os_addr_t   shirq_isr_next;

	bfa_os_addr_t   shirq_msk_next;

	bfa_os_addr_t   smem_page_start;
@@ -154,7 +156,6 @@ struct bfa_ioc_s { 
	struct bfa_timer_s 	ioc_timer;

	struct bfa_timer_s 	sem_timer;

	u32		hb_count;

	u32		hb_fail;

	u32		retry_count;

	struct list_head		hb_notify_q;

	void			*dbg_fwsave;
@@ -177,6 +178,22 @@ struct bfa_ioc_s { 
	struct bfi_ioc_attr_s	*attr;

	struct bfa_ioc_cbfn_s	*cbfn;

	struct bfa_ioc_mbox_mod_s mbox_mod;

	struct bfa_ioc_hwif_s   *ioc_hwif;

};



struct bfa_ioc_hwif_s {

	bfa_status_t    (*ioc_pll_init) (struct bfa_ioc_s *ioc);

	bfa_boolean_t   (*ioc_firmware_lock)    (struct bfa_ioc_s *ioc);

	void            (*ioc_firmware_unlock)  (struct bfa_ioc_s *ioc);

	u32 *   	(*ioc_fwimg_get_chunk)  (struct bfa_ioc_s *ioc,

						u32 off);

	u32		(*ioc_fwimg_get_size)   (struct bfa_ioc_s *ioc);

	void		(*ioc_reg_init) (struct bfa_ioc_s *ioc);

	void		(*ioc_map_port) (struct bfa_ioc_s *ioc);

	void		(*ioc_isr_mode_set)     (struct bfa_ioc_s *ioc,

						bfa_boolean_t msix);

	void            (*ioc_notify_hbfail)    (struct bfa_ioc_s *ioc);

	void            (*ioc_ownership_reset)  (struct bfa_ioc_s *ioc);

};



#define bfa_ioc_pcifn(__ioc)		((__ioc)->pcidev.pci_func)
@@ -191,6 +208,15 @@ struct bfa_ioc_s { 
#define bfa_ioc_rx_bbcredit(__ioc)	((__ioc)->attr->rx_bbcredit)

#define bfa_ioc_speed_sup(__ioc)	\

	BFI_ADAPTER_GETP(SPEED, (__ioc)->attr->adapter_prop)

#define bfa_ioc_get_nports(__ioc)       \

	BFI_ADAPTER_GETP(NPORTS, (__ioc)->attr->adapter_prop)



#define bfa_ioc_stats(_ioc, _stats)     ((_ioc)->stats._stats++)

#define BFA_IOC_FWIMG_MINSZ     (16 * 1024)



#define BFA_IOC_FLASH_CHUNK_NO(off)             (off / BFI_FLASH_CHUNK_SZ_WORDS)

#define BFA_IOC_FLASH_OFFSET_IN_CHUNK(off)      (off % BFI_FLASH_CHUNK_SZ_WORDS)

#define BFA_IOC_FLASH_CHUNK_ADDR(chunkno)  (chunkno * BFI_FLASH_CHUNK_SZ_WORDS)



/**

 * IOC mailbox interface
@@ -207,6 +233,14 @@ void bfa_ioc_mbox_regisr(struct bfa_ioc_s *ioc, enum bfi_mclass mc, 
/**

 * IOC interfaces

 */

#define bfa_ioc_pll_init(__ioc) ((__ioc)->ioc_hwif->ioc_pll_init(__ioc))

#define bfa_ioc_isr_mode_set(__ioc, __msix)                     \

			((__ioc)->ioc_hwif->ioc_isr_mode_set(__ioc, __msix))

#define bfa_ioc_ownership_reset(__ioc)                          \

			((__ioc)->ioc_hwif->ioc_ownership_reset(__ioc))



void bfa_ioc_set_ct_hwif(struct bfa_ioc_s *ioc);

void bfa_ioc_set_cb_hwif(struct bfa_ioc_s *ioc);

void bfa_ioc_attach(struct bfa_ioc_s *ioc, void *bfa,

		struct bfa_ioc_cbfn_s *cbfn, struct bfa_timer_mod_s *timer_mod,

		struct bfa_trc_mod_s *trcmod,
@@ -223,8 +257,6 @@ bfa_boolean_t bfa_ioc_intx_claim(struct bfa_ioc_s *ioc); 
void bfa_ioc_boot(struct bfa_ioc_s *ioc, u32 boot_type, u32 boot_param);

void bfa_ioc_isr(struct bfa_ioc_s *ioc, struct bfi_mbmsg_s *msg);

void bfa_ioc_error_isr(struct bfa_ioc_s *ioc);

void bfa_ioc_isr_mode_set(struct bfa_ioc_s *ioc, bfa_boolean_t intx);

bfa_status_t bfa_ioc_pll_init(struct bfa_ioc_s *ioc);

bfa_boolean_t bfa_ioc_is_operational(struct bfa_ioc_s *ioc);

bfa_boolean_t bfa_ioc_is_disabled(struct bfa_ioc_s *ioc);

bfa_boolean_t bfa_ioc_fw_mismatch(struct bfa_ioc_s *ioc);
@@ -245,6 +277,13 @@ void bfa_ioc_set_fcmode(struct bfa_ioc_s *ioc); 
bfa_boolean_t bfa_ioc_get_fcmode(struct bfa_ioc_s *ioc);

void bfa_ioc_hbfail_register(struct bfa_ioc_s *ioc,

	struct bfa_ioc_hbfail_notify_s *notify);

bfa_boolean_t bfa_ioc_sem_get(bfa_os_addr_t sem_reg);

void bfa_ioc_sem_release(bfa_os_addr_t sem_reg);

void bfa_ioc_hw_sem_release(struct bfa_ioc_s *ioc);

void bfa_ioc_fwver_get(struct bfa_ioc_s *ioc,

			struct bfi_ioc_image_hdr_s *fwhdr);

bfa_boolean_t bfa_ioc_fwver_cmp(struct bfa_ioc_s *ioc,

			struct bfi_ioc_image_hdr_s *fwhdr);



/*

 * bfa mfg wwn API functions

drivers/scsi/bfa/bfa_ioc_cb.c

0 → 100644
+273 −0

File added.

Preview size limit exceeded, changes collapsed.