Commit 1c8a4c37 authored by Krishna Gudipati's avatar Krishna Gudipati Committed by James Bottomley
Browse files

[SCSI] bfa: Rename pport to fcport in BFA FCS. 



Rename pport structures to fcport in BFA FCS, to resolve confusion
about the port structures in the firmware, and make sure the SG page
is setup correctly.

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

drivers/scsi/bfa/bfa_fcport.c

+908 −662

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/bfa/bfa_fcs_port.c

+1 −1
Original line number Diff line number Diff line
@@ -57,5 +57,5 @@ bfa_fcs_pport_event_handler(void *cbarg, bfa_pport_event_t event) 
void

bfa_fcs_pport_attach(struct bfa_fcs_s *fcs)

{

	bfa_pport_event_register(fcs->bfa, bfa_fcs_pport_event_handler, fcs);

	bfa_fcport_event_register(fcs->bfa, bfa_fcs_pport_event_handler, fcs);

}

drivers/scsi/bfa/bfa_module.c

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
 */

struct bfa_module_s *hal_mods[] = {

	&hal_mod_sgpg,

	&hal_mod_pport,

	&hal_mod_fcport,

	&hal_mod_fcxp,

	&hal_mod_lps,

	&hal_mod_uf,
@@ -45,7 +45,7 @@ bfa_isr_func_t bfa_isrs[BFI_MC_MAX] = { 
	bfa_isr_unhandled,	/* BFI_MC_DIAG */

	bfa_isr_unhandled,	/* BFI_MC_FLASH */

	bfa_isr_unhandled,	/* BFI_MC_CEE */

	bfa_pport_isr,		/* BFI_MC_PORT */

	bfa_fcport_isr,		/* BFI_MC_FCPORT */

	bfa_isr_unhandled,	/* BFI_MC_IOCFC */

	bfa_isr_unhandled,	/* BFI_MC_LL */

	bfa_uf_isr,		/* BFI_MC_UF */

drivers/scsi/bfa/bfa_modules_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 




struct bfa_modules_s {

	struct bfa_pport_s	pport;	/*  physical port module	*/

	struct bfa_fcport_s	fcport;	/*  fc port module	*/

	struct bfa_fcxp_mod_s fcxp_mod; /*  fcxp module		*/

	struct bfa_lps_mod_s lps_mod;   /*  fcxp module		*/

	struct bfa_uf_mod_s uf_mod;	/*  unsolicited frame module	*/

drivers/scsi/bfa/bfa_port_priv.h

+12 −7
Original line number Diff line number Diff line
@@ -25,17 +25,17 @@ 
/**

 * Link notification data structure

 */

struct bfa_pport_ln_s {

	struct bfa_pport_s     *pport;

struct bfa_fcport_ln_s {

	struct bfa_fcport_s     *fcport;

	bfa_sm_t                sm;

	struct bfa_cb_qe_s      ln_qe;  /*  BFA callback queue elem for ln */

	enum bfa_pport_linkstate ln_event; /*  ln event for callback */

};



/**

 * BFA physical port data structure

 * BFA FC port data structure

 */

struct bfa_pport_s {

struct bfa_fcport_s {

	struct bfa_s 		*bfa;	/*  parent BFA instance */

	bfa_sm_t		sm;	/*  port state machine */

	wwn_t			nwwn;	/*  node wwn of physical port */
@@ -62,7 +62,7 @@ struct bfa_pport_s { 
		union bfi_pport_i2h_msg_u i2hmsg;

	} event_arg;

	void			*bfad;	/*  BFA driver handle */

	struct bfa_pport_ln_s   ln; /* Link Notification */

	struct bfa_fcport_ln_s   ln; /* Link Notification */

	struct bfa_cb_qe_s		hcb_qe;	/*  BFA callback queue elem */

	u32		msgtag;	/*  fimrware msg tag for reply */

	u8			*stats_kva;
@@ -88,12 +88,17 @@ struct bfa_pport_s { 
					/*  driver callback function */

	void			*stats_cbarg;

					/* *!< user callback arg */

	/* FCport stats */

	u8         *fcport_stats_kva;

	u64        fcport_stats_pa;

	union bfa_fcport_stats_u *fcport_stats;

	union bfa_fcport_stats_u *fcport_stats_ret;

};



#define BFA_PORT_MOD(__bfa)	(&(__bfa)->modules.pport)

#define BFA_FCPORT_MOD(__bfa)	(&(__bfa)->modules.fcport)



/*

 * public functions

 */

void	bfa_pport_isr(struct bfa_s *bfa, struct bfi_msg_s *msg);

void	bfa_fcport_isr(struct bfa_s *bfa, struct bfi_msg_s *msg);

#endif /* __BFA_PORT_PRIV_H__ */