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

Commit 2993cc71 authored by Krishna Gudipati's avatar Krishna Gudipati Committed by James Bottomley
Browse files

[SCSI] bfa: AEN and byte alignment fixes. 



Replace enum types with int and rearrange the fields to fix some
alignment issue.

Local var ioc_attr is causing the stack to overflow, so removed the
usage of the local ioc_attr var and now invoking an API to return the
ioc_type.

Fix some AEN issues.

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

drivers/scsi/bfa/bfa_fcport.c

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ bfa_pport_aen_post(struct bfa_pport_s *pport, enum bfa_port_aen_event event) 
	char            pwwn_ptr[BFA_STRING_32];

	struct bfa_ioc_attr_s ioc_attr;



	memset(&aen_data, 0, sizeof(aen_data));

	wwn2str(pwwn_ptr, pwwn);

	switch (event) {

	case BFA_PORT_AEN_ONLINE:

drivers/scsi/bfa/bfa_ioc.c

+21 −11
Original line number Diff line number Diff line
@@ -1731,6 +1731,21 @@ bfa_ioc_get_adapter_attr(struct bfa_ioc_s *ioc, 
	ad_attr->cna_capable = ioc->cna;

}



enum bfa_ioc_type_e

bfa_ioc_get_type(struct bfa_ioc_s *ioc)

{

	if (!ioc->ctdev || ioc->fcmode)

		return BFA_IOC_TYPE_FC;

	else if (ioc->ioc_mc == BFI_MC_IOCFC)

		return BFA_IOC_TYPE_FCoE;

	else if (ioc->ioc_mc == BFI_MC_LL)

		return BFA_IOC_TYPE_LL;

	else {

		bfa_assert(ioc->ioc_mc == BFI_MC_LL);

		return BFA_IOC_TYPE_LL;

	}

}



void

bfa_ioc_get_attr(struct bfa_ioc_s *ioc, struct bfa_ioc_attr_s *ioc_attr)

{
@@ -1739,12 +1754,7 @@ bfa_ioc_get_attr(struct bfa_ioc_s *ioc, struct bfa_ioc_attr_s *ioc_attr) 
	ioc_attr->state = bfa_sm_to_state(ioc_sm_table, ioc->fsm);

	ioc_attr->port_id = ioc->port_id;



	if (!ioc->ctdev || ioc->fcmode)

		ioc_attr->ioc_type = BFA_IOC_TYPE_FC;

	else if (ioc->ioc_mc == BFI_MC_IOCFC)

		ioc_attr->ioc_type = BFA_IOC_TYPE_FCoE;

	else if (ioc->ioc_mc == BFI_MC_LL)

		ioc_attr->ioc_type = BFA_IOC_TYPE_LL;

	ioc_attr->ioc_type = bfa_ioc_get_type(ioc);



	bfa_ioc_get_adapter_attr(ioc, &ioc_attr->adapter_attr);
@@ -1860,7 +1870,7 @@ bfa_ioc_aen_post(struct bfa_ioc_s *ioc, enum bfa_ioc_aen_event event) 
	union bfa_aen_data_u aen_data;

	struct bfa_log_mod_s *logmod = ioc->logm;

	s32         inst_num = 0;

	struct bfa_ioc_attr_s ioc_attr;

	enum bfa_ioc_type_e ioc_type;



	switch (event) {

	case BFA_IOC_AEN_HBGOOD:
@@ -1884,8 +1894,8 @@ bfa_ioc_aen_post(struct bfa_ioc_s *ioc, enum bfa_ioc_aen_event event) 


	memset(&aen_data.ioc.pwwn, 0, sizeof(aen_data.ioc.pwwn));

	memset(&aen_data.ioc.mac, 0, sizeof(aen_data.ioc.mac));

	bfa_ioc_get_attr(ioc, &ioc_attr);

	switch (ioc_attr.ioc_type) {

	ioc_type = bfa_ioc_get_type(ioc);

	switch (ioc_type) {

	case BFA_IOC_TYPE_FC:

		aen_data.ioc.pwwn = bfa_ioc_get_pwwn(ioc);

		break;
@@ -1897,10 +1907,10 @@ bfa_ioc_aen_post(struct bfa_ioc_s *ioc, enum bfa_ioc_aen_event event) 
		aen_data.ioc.mac = bfa_ioc_get_mac(ioc);

		break;

	default:

		bfa_assert(ioc_attr.ioc_type == BFA_IOC_TYPE_FC);

		bfa_assert(ioc_type == BFA_IOC_TYPE_FC);

		break;

	}

	aen_data.ioc.ioc_type = ioc_attr.ioc_type;

	aen_data.ioc.ioc_type = ioc_type;

}



/**

drivers/scsi/bfa/bfad.c

+1 −8
Original line number Diff line number Diff line
@@ -677,7 +677,6 @@ bfad_drv_init(struct bfad_s *bfad) 
	bfa_status_t    rc;

	unsigned long   flags;

	struct bfa_fcs_driver_info_s driver_info;

	int             i;



	bfad->cfg_data.rport_del_timeout = rport_del_timeout;

	bfad->cfg_data.lun_queue_depth = bfa_lun_queue_depth;
@@ -697,12 +696,7 @@ bfad_drv_init(struct bfad_s *bfad) 
	bfa_init_log(&bfad->bfa, bfad->logmod);

	bfa_init_trc(&bfad->bfa, bfad->trcmod);

	bfa_init_aen(&bfad->bfa, bfad->aen);

	INIT_LIST_HEAD(&bfad->file_q);

	INIT_LIST_HEAD(&bfad->file_free_q);

	for (i = 0; i < BFAD_AEN_MAX_APPS; i++) {

		bfa_q_qe_init(&bfad->file_buf[i].qe);

		list_add_tail(&bfad->file_buf[i].qe, &bfad->file_free_q);

	}

	memset(bfad->file_map, 0, sizeof(bfad->file_map));

	bfa_init_plog(&bfad->bfa, &bfad->plog_buf);

	bfa_plog_init(&bfad->plog_buf);

	bfa_plog_str(&bfad->plog_buf, BFA_PL_MID_DRVR, BFA_PL_EID_DRIVER_START,
@@ -799,7 +793,6 @@ bfad_drv_uninit(struct bfad_s *bfad) 
	bfa_isr_disable(&bfad->bfa);

	bfa_detach(&bfad->bfa);

	bfad_remove_intr(bfad);

	bfa_assert(list_empty(&bfad->file_q));

	bfad_hal_mem_release(bfad);



	bfad->bfad_flags &= ~BFAD_DRV_INIT_DONE;

drivers/scsi/bfa/bfad_drv.h

+1 −11
Original line number Diff line number Diff line
@@ -139,14 +139,6 @@ struct bfad_cfg_param_s { 
	u32        binding_method;

};



#define BFAD_AEN_MAX_APPS 8

struct bfad_aen_file_s {

	struct list_head  qe;

	struct bfad_s *bfad;

	s32 ri;

	s32 app_id;

};



/*

 * BFAD (PCI function) data structure

 */
@@ -186,9 +178,7 @@ struct bfad_s { 
	struct bfa_log_mod_s  *logmod;

	struct bfa_aen_s      *aen;

	struct bfa_aen_s       aen_buf;

	struct bfad_aen_file_s file_buf[BFAD_AEN_MAX_APPS];

	struct list_head         file_q;

	struct list_head         file_free_q;

	void		*file_map[BFA_AEN_MAX_APP];

	struct bfa_plog_s      plog_buf;

	int             ref_count;

	bfa_boolean_t	ipfc_enabled;

drivers/scsi/bfa/include/aen/bfa_aen.h

+27 −23
Original line number Diff line number Diff line
@@ -18,20 +18,23 @@ 
#define __BFA_AEN_H__



#include "defs/bfa_defs_aen.h"

#include "defs/bfa_defs_status.h"

#include "cs/bfa_debug.h"



#define BFA_AEN_MAX_ENTRY	512



extern s32 bfa_aen_max_cfg_entry;

extern int bfa_aen_max_cfg_entry;

struct bfa_aen_s {

	void		*bfad;

	s32		max_entry;

	s32		write_index;

	s32		read_index;

	u32	bfad_num;

	u32	seq_num;

	int		max_entry;

	int		write_index;

	int		read_index;

	int		bfad_num;

	int		seq_num;

	void		(*aen_cb_notify)(void *bfad);

	void		(*gettimeofday)(struct bfa_timeval_s *tv);

	struct bfa_trc_mod_s *trcmod;

	int		app_ri[BFA_AEN_MAX_APP]; /* For multiclient support */

	struct bfa_aen_entry_s list[BFA_AEN_MAX_ENTRY]; /* Must be the last */

};
@@ -45,48 +48,49 @@ bfa_aen_set_max_cfg_entry(int max_entry) 
	bfa_aen_max_cfg_entry = max_entry;

}



static inline s32

static inline int

bfa_aen_get_max_cfg_entry(void)

{

	return bfa_aen_max_cfg_entry;

}



static inline s32

static inline int

bfa_aen_get_meminfo(void)

{

	return sizeof(struct bfa_aen_entry_s) * bfa_aen_get_max_cfg_entry();

}



static inline s32

static inline int

bfa_aen_get_wi(struct bfa_aen_s *aen)

{

	return aen->write_index;

}



static inline s32

static inline int

bfa_aen_get_ri(struct bfa_aen_s *aen)

{

	return aen->read_index;

}



static inline s32

bfa_aen_fetch_count(struct bfa_aen_s *aen, s32 read_index)

static inline int

bfa_aen_fetch_count(struct bfa_aen_s *aen, enum bfa_aen_app  app_id)

{

	return ((aen->write_index + aen->max_entry) - read_index)

	bfa_assert((app_id < BFA_AEN_MAX_APP) && (app_id >= bfa_aen_app_bcu));

	return ((aen->write_index + aen->max_entry) - aen->app_ri[app_id])

		% aen->max_entry;

}



s32 bfa_aen_init(struct bfa_aen_s *aen, struct bfa_trc_mod_s *trcmod,

		void *bfad, u32 inst_id, void (*aen_cb_notify)(void *),

int bfa_aen_init(struct bfa_aen_s *aen, struct bfa_trc_mod_s *trcmod,

		void *bfad, int bfad_num, void (*aen_cb_notify)(void *),

		void (*gettimeofday)(struct bfa_timeval_s *));



s32 bfa_aen_post(struct bfa_aen_s *aen, enum bfa_aen_category aen_category,

void bfa_aen_post(struct bfa_aen_s *aen, enum bfa_aen_category aen_category,

		     int aen_type, union bfa_aen_data_u *aen_data);



s32 bfa_aen_fetch(struct bfa_aen_s *aen, struct bfa_aen_entry_s *aen_entry,

		      s32 entry_space, s32 rii, s32 *ri_arr,

		      s32 ri_arr_cnt);

bfa_status_t bfa_aen_fetch(struct bfa_aen_s *aen,

			struct bfa_aen_entry_s *aen_entry,

			int entry_req, enum bfa_aen_app app_id, int *entry_ret);



s32 bfa_aen_get_inst(struct bfa_aen_s *aen);

int bfa_aen_get_inst(struct bfa_aen_s *aen);



#endif /* __BFA_AEN_H__ */