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

Commit 148d6103 authored by Krishna Gudipati's avatar Krishna Gudipati Committed by James Bottomley
Browse files

[SCSI] bfa: Added support for CEE info and stats query. 



- Added CEE sub-module.
- Added support to collect stats/cee module info
  using BSG interface.

Signed-off-by: default avatarKrishna Gudipati <kgudipat@brocade.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 60138066

drivers/scsi/bfa/bfa_core.c

+14 −0
Original line number Diff line number Diff line
@@ -111,6 +111,17 @@ bfa_com_ablk_attach(struct bfa_s *bfa) 
	bfa_ablk_memclaim(ablk, ablk_dma->kva_curp, ablk_dma->dma_curp);

}



static void

bfa_com_cee_attach(struct bfa_s *bfa)

{

	struct bfa_cee_s	*cee = &bfa->modules.cee;

	struct bfa_mem_dma_s	*cee_dma = BFA_MEM_CEE_DMA(bfa);



	cee->trcmod = bfa->trcmod;

	bfa_cee_attach(cee, &bfa->ioc, bfa);

	bfa_cee_mem_claim(cee, cee_dma->kva_curp, cee_dma->dma_curp);

}



/*

 * BFA IOC FC related definitions

 */
@@ -1348,6 +1359,7 @@ bfa_cfg_get_meminfo(struct bfa_iocfc_cfg_s *cfg, struct bfa_meminfo_s *meminfo, 
	int		i;

	struct bfa_mem_dma_s *port_dma = BFA_MEM_PORT_DMA(bfa);

	struct bfa_mem_dma_s *ablk_dma = BFA_MEM_ABLK_DMA(bfa);

	struct bfa_mem_dma_s *cee_dma = BFA_MEM_CEE_DMA(bfa);



	WARN_ON((cfg == NULL) || (meminfo == NULL));
@@ -1365,6 +1377,7 @@ bfa_cfg_get_meminfo(struct bfa_iocfc_cfg_s *cfg, struct bfa_meminfo_s *meminfo, 
	/* dma info setup */

	bfa_mem_dma_setup(meminfo, port_dma, bfa_port_meminfo());

	bfa_mem_dma_setup(meminfo, ablk_dma, bfa_ablk_meminfo());

	bfa_mem_dma_setup(meminfo, cee_dma, bfa_cee_meminfo());

}



/*
@@ -1432,6 +1445,7 @@ bfa_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg, 


	bfa_com_port_attach(bfa);

	bfa_com_ablk_attach(bfa);

	bfa_com_cee_attach(bfa);

}



/*

drivers/scsi/bfa/bfa_defs_svc.h

+73 −0
Original line number Diff line number Diff line
@@ -1142,4 +1142,77 @@ struct bfa_port_cfg_mode_s { 
	enum bfa_mode_s	mode;

};



#pragma pack(1)



#define BFA_CEE_LLDP_MAX_STRING_LEN	(128)

#define BFA_CEE_DCBX_MAX_PRIORITY	(8)

#define BFA_CEE_DCBX_MAX_PGID		(8)



struct bfa_cee_lldp_str_s {

	u8	sub_type;

	u8	len;

	u8	rsvd[2];

	u8	value[BFA_CEE_LLDP_MAX_STRING_LEN];

};



struct bfa_cee_lldp_cfg_s {

	struct bfa_cee_lldp_str_s chassis_id;

	struct bfa_cee_lldp_str_s port_id;

	struct bfa_cee_lldp_str_s port_desc;

	struct bfa_cee_lldp_str_s sys_name;

	struct bfa_cee_lldp_str_s sys_desc;

	struct bfa_cee_lldp_str_s mgmt_addr;

	u16	time_to_live;

	u16	enabled_system_cap;

};



/* CEE/DCBX parameters */

struct bfa_cee_dcbx_cfg_s {

	u8	pgid[BFA_CEE_DCBX_MAX_PRIORITY];

	u8	pg_percentage[BFA_CEE_DCBX_MAX_PGID];

	u8	pfc_primap; /* bitmap of priorties with PFC enabled */

	u8	fcoe_primap; /* bitmap of priorities used for FcoE traffic */

	u8	iscsi_primap; /* bitmap of priorities used for iSCSI traffic */

	u8	dcbx_version; /* operating version:CEE or preCEE */

	u8	lls_fcoe; /* FCoE Logical Link Status */

	u8	lls_lan; /* LAN Logical Link Status */

	u8	rsvd[2];

};



/* CEE Query */

struct bfa_cee_attr_s {

	u8	cee_status;

	u8	error_reason;

	struct bfa_cee_lldp_cfg_s lldp_remote;

	struct bfa_cee_dcbx_cfg_s dcbx_remote;

	mac_t src_mac;

	u8	link_speed;

	u8	nw_priority;

	u8	filler[2];

};



/* LLDP/DCBX/CEE Statistics */

struct bfa_cee_stats_s {

	u32		lldp_tx_frames;		/* LLDP Tx Frames */

	u32		lldp_rx_frames;		/* LLDP Rx Frames */

	u32		lldp_rx_frames_invalid; /* LLDP Rx Frames invalid */

	u32		lldp_rx_frames_new;     /* LLDP Rx Frames new */

	u32		lldp_tlvs_unrecognized; /* LLDP Rx unrecog. TLVs */

	u32		lldp_rx_shutdown_tlvs;  /* LLDP Rx shutdown TLVs */

	u32		lldp_info_aged_out;     /* LLDP remote info aged */

	u32		dcbx_phylink_ups;       /* DCBX phy link ups */

	u32		dcbx_phylink_downs;     /* DCBX phy link downs */

	u32		dcbx_rx_tlvs;           /* DCBX Rx TLVs */

	u32		dcbx_rx_tlvs_invalid;   /* DCBX Rx TLVs invalid */

	u32		dcbx_control_tlv_error; /* DCBX control TLV errors */

	u32		dcbx_feature_tlv_error; /* DCBX feature TLV errors */

	u32		dcbx_cee_cfg_new;       /* DCBX new CEE cfg rcvd */

	u32		cee_status_down;        /* DCB status down */

	u32		cee_status_up;          /* DCB status up */

	u32		cee_hw_cfg_changed;     /* DCB hw cfg changed */

	u32		cee_rx_invalid_cfg;     /* DCB invalid cfg */

};



#pragma pack()



#endif /* __BFA_DEFS_SVC_H__ */

drivers/scsi/bfa/bfa_modules.h

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ struct bfa_modules_s { 
	struct bfa_sgpg_mod_s	sgpg_mod;	/*  SG page module	      */

	struct bfa_port_s	port;		/*  Physical port module     */

	struct bfa_ablk_s	ablk;		/*  ASIC block config module */

	struct bfa_cee_s	cee;		/*  CEE Module	*/

};



/*

drivers/scsi/bfa/bfa_port.c

+365 −0
Original line number Diff line number Diff line
@@ -480,3 +480,368 @@ bfa_port_attach(struct bfa_port_s *port, struct bfa_ioc_s *ioc, 


	bfa_trc(port, 0);

}



/*

 *	CEE module specific definitions

 */



/*

 * bfa_cee_get_attr_isr()

 *

 * @brief CEE ISR for get-attributes responses from f/w

 *

 * @param[in] cee - Pointer to the CEE module

 *		    status - Return status from the f/w

 *

 * @return void

 */

static void

bfa_cee_get_attr_isr(struct bfa_cee_s *cee, bfa_status_t status)

{

	struct bfa_cee_lldp_cfg_s *lldp_cfg = &cee->attr->lldp_remote;



	cee->get_attr_status = status;

	bfa_trc(cee, 0);

	if (status == BFA_STATUS_OK) {

		bfa_trc(cee, 0);

		memcpy(cee->attr, cee->attr_dma.kva,

			sizeof(struct bfa_cee_attr_s));

		lldp_cfg->time_to_live = be16_to_cpu(lldp_cfg->time_to_live);

		lldp_cfg->enabled_system_cap =

				be16_to_cpu(lldp_cfg->enabled_system_cap);

	}

	cee->get_attr_pending = BFA_FALSE;

	if (cee->cbfn.get_attr_cbfn) {

		bfa_trc(cee, 0);

		cee->cbfn.get_attr_cbfn(cee->cbfn.get_attr_cbarg, status);

	}

}



/*

 * bfa_cee_get_stats_isr()

 *

 * @brief CEE ISR for get-stats responses from f/w

 *

 * @param[in] cee - Pointer to the CEE module

 *	      status - Return status from the f/w

 *

 * @return void

 */

static void

bfa_cee_get_stats_isr(struct bfa_cee_s *cee, bfa_status_t status)

{

	u32 *buffer;

	int i;



	cee->get_stats_status = status;

	bfa_trc(cee, 0);

	if (status == BFA_STATUS_OK) {

		bfa_trc(cee, 0);

		memcpy(cee->stats, cee->stats_dma.kva,

			sizeof(struct bfa_cee_stats_s));

		/* swap the cee stats */

		buffer = (u32 *)cee->stats;

		for (i = 0; i < (sizeof(struct bfa_cee_stats_s) /

				 sizeof(u32)); i++)

			buffer[i] = cpu_to_be32(buffer[i]);

	}

	cee->get_stats_pending = BFA_FALSE;

	bfa_trc(cee, 0);

	if (cee->cbfn.get_stats_cbfn) {

		bfa_trc(cee, 0);

		cee->cbfn.get_stats_cbfn(cee->cbfn.get_stats_cbarg, status);

	}

}



/*

 * bfa_cee_reset_stats_isr()

 *

 * @brief CEE ISR for reset-stats responses from f/w

 *

 * @param[in] cee - Pointer to the CEE module

 *            status - Return status from the f/w

 *

 * @return void

 */

static void

bfa_cee_reset_stats_isr(struct bfa_cee_s *cee, bfa_status_t status)

{

	cee->reset_stats_status = status;

	cee->reset_stats_pending = BFA_FALSE;

	if (cee->cbfn.reset_stats_cbfn)

		cee->cbfn.reset_stats_cbfn(cee->cbfn.reset_stats_cbarg, status);

}



/*

 * bfa_cee_meminfo()

 *

 * @brief Returns the size of the DMA memory needed by CEE module

 *

 * @param[in] void

 *

 * @return Size of DMA region

 */

u32

bfa_cee_meminfo(void)

{

	return BFA_ROUNDUP(sizeof(struct bfa_cee_attr_s), BFA_DMA_ALIGN_SZ) +

		BFA_ROUNDUP(sizeof(struct bfa_cee_stats_s), BFA_DMA_ALIGN_SZ);

}



/*

 * bfa_cee_mem_claim()

 *

 * @brief Initialized CEE DMA Memory

 *

 * @param[in] cee CEE module pointer

 *            dma_kva Kernel Virtual Address of CEE DMA Memory

 *            dma_pa  Physical Address of CEE DMA Memory

 *

 * @return void

 */

void

bfa_cee_mem_claim(struct bfa_cee_s *cee, u8 *dma_kva, u64 dma_pa)

{

	cee->attr_dma.kva = dma_kva;

	cee->attr_dma.pa = dma_pa;

	cee->stats_dma.kva = dma_kva + BFA_ROUNDUP(

			     sizeof(struct bfa_cee_attr_s), BFA_DMA_ALIGN_SZ);

	cee->stats_dma.pa = dma_pa + BFA_ROUNDUP(

			     sizeof(struct bfa_cee_attr_s), BFA_DMA_ALIGN_SZ);

	cee->attr = (struct bfa_cee_attr_s *) dma_kva;

	cee->stats = (struct bfa_cee_stats_s *) (dma_kva + BFA_ROUNDUP(

			sizeof(struct bfa_cee_attr_s), BFA_DMA_ALIGN_SZ));

}



/*

 * bfa_cee_get_attr()

 *

 * @brief

 *   Send the request to the f/w to fetch CEE attributes.

 *

 * @param[in] Pointer to the CEE module data structure.

 *

 * @return Status

 */



bfa_status_t

bfa_cee_get_attr(struct bfa_cee_s *cee, struct bfa_cee_attr_s *attr,

		 bfa_cee_get_attr_cbfn_t cbfn, void *cbarg)

{

	struct bfi_cee_get_req_s *cmd;



	WARN_ON((cee == NULL) || (cee->ioc == NULL));

	bfa_trc(cee, 0);

	if (!bfa_ioc_is_operational(cee->ioc)) {

		bfa_trc(cee, 0);

		return BFA_STATUS_IOC_FAILURE;

	}

	if (cee->get_attr_pending == BFA_TRUE) {

		bfa_trc(cee, 0);

		return  BFA_STATUS_DEVBUSY;

	}

	cee->get_attr_pending = BFA_TRUE;

	cmd = (struct bfi_cee_get_req_s *) cee->get_cfg_mb.msg;

	cee->attr = attr;

	cee->cbfn.get_attr_cbfn = cbfn;

	cee->cbfn.get_attr_cbarg = cbarg;

	bfi_h2i_set(cmd->mh, BFI_MC_CEE, BFI_CEE_H2I_GET_CFG_REQ,

		bfa_ioc_portid(cee->ioc));

	bfa_dma_be_addr_set(cmd->dma_addr, cee->attr_dma.pa);

	bfa_ioc_mbox_queue(cee->ioc, &cee->get_cfg_mb);



	return BFA_STATUS_OK;

}



/*

 * bfa_cee_get_stats()

 *

 * @brief

 *   Send the request to the f/w to fetch CEE statistics.

 *

 * @param[in] Pointer to the CEE module data structure.

 *

 * @return Status

 */



bfa_status_t

bfa_cee_get_stats(struct bfa_cee_s *cee, struct bfa_cee_stats_s *stats,

		  bfa_cee_get_stats_cbfn_t cbfn, void *cbarg)

{

	struct bfi_cee_get_req_s *cmd;



	WARN_ON((cee == NULL) || (cee->ioc == NULL));



	if (!bfa_ioc_is_operational(cee->ioc)) {

		bfa_trc(cee, 0);

		return BFA_STATUS_IOC_FAILURE;

	}

	if (cee->get_stats_pending == BFA_TRUE) {

		bfa_trc(cee, 0);

		return  BFA_STATUS_DEVBUSY;

	}

	cee->get_stats_pending = BFA_TRUE;

	cmd = (struct bfi_cee_get_req_s *) cee->get_stats_mb.msg;

	cee->stats = stats;

	cee->cbfn.get_stats_cbfn = cbfn;

	cee->cbfn.get_stats_cbarg = cbarg;

	bfi_h2i_set(cmd->mh, BFI_MC_CEE, BFI_CEE_H2I_GET_STATS_REQ,

		bfa_ioc_portid(cee->ioc));

	bfa_dma_be_addr_set(cmd->dma_addr, cee->stats_dma.pa);

	bfa_ioc_mbox_queue(cee->ioc, &cee->get_stats_mb);



	return BFA_STATUS_OK;

}



/*

 * bfa_cee_reset_stats()

 *

 * @brief Clears CEE Stats in the f/w.

 *

 * @param[in] Pointer to the CEE module data structure.

 *

 * @return Status

 */



bfa_status_t

bfa_cee_reset_stats(struct bfa_cee_s *cee,

		    bfa_cee_reset_stats_cbfn_t cbfn, void *cbarg)

{

	struct bfi_cee_reset_stats_s *cmd;



	WARN_ON((cee == NULL) || (cee->ioc == NULL));

	if (!bfa_ioc_is_operational(cee->ioc)) {

		bfa_trc(cee, 0);

		return BFA_STATUS_IOC_FAILURE;

	}

	if (cee->reset_stats_pending == BFA_TRUE) {

		bfa_trc(cee, 0);

		return  BFA_STATUS_DEVBUSY;

	}

	cee->reset_stats_pending = BFA_TRUE;

	cmd = (struct bfi_cee_reset_stats_s *) cee->reset_stats_mb.msg;

	cee->cbfn.reset_stats_cbfn = cbfn;

	cee->cbfn.reset_stats_cbarg = cbarg;

	bfi_h2i_set(cmd->mh, BFI_MC_CEE, BFI_CEE_H2I_RESET_STATS,

		bfa_ioc_portid(cee->ioc));

	bfa_ioc_mbox_queue(cee->ioc, &cee->reset_stats_mb);



	return BFA_STATUS_OK;

}



/*

 * bfa_cee_isrs()

 *

 * @brief Handles Mail-box interrupts for CEE module.

 *

 * @param[in] Pointer to the CEE module data structure.

 *

 * @return void

 */



void

bfa_cee_isr(void *cbarg, struct bfi_mbmsg_s *m)

{

	union bfi_cee_i2h_msg_u *msg;

	struct bfi_cee_get_rsp_s *get_rsp;

	struct bfa_cee_s *cee = (struct bfa_cee_s *) cbarg;

	msg = (union bfi_cee_i2h_msg_u *) m;

	get_rsp = (struct bfi_cee_get_rsp_s *) m;

	bfa_trc(cee, msg->mh.msg_id);

	switch (msg->mh.msg_id) {

	case BFI_CEE_I2H_GET_CFG_RSP:

		bfa_trc(cee, get_rsp->cmd_status);

		bfa_cee_get_attr_isr(cee, get_rsp->cmd_status);

		break;

	case BFI_CEE_I2H_GET_STATS_RSP:

		bfa_cee_get_stats_isr(cee, get_rsp->cmd_status);

		break;

	case BFI_CEE_I2H_RESET_STATS_RSP:

		bfa_cee_reset_stats_isr(cee, get_rsp->cmd_status);

		break;

	default:

		WARN_ON(1);

	}

}



/*

 * bfa_cee_notify()

 *

 * @brief CEE module IOC event handler.

 *

 * @param[in] Pointer to the CEE module data structure.

 * @param[in] IOC event type

 *

 * @return void

 */



void

bfa_cee_notify(void *arg, enum bfa_ioc_event_e event)

{

	struct bfa_cee_s *cee = (struct bfa_cee_s *) arg;



	bfa_trc(cee, event);



	switch (event) {

	case BFA_IOC_E_DISABLED:

	case BFA_IOC_E_FAILED:

		if (cee->get_attr_pending == BFA_TRUE) {

			cee->get_attr_status = BFA_STATUS_FAILED;

			cee->get_attr_pending  = BFA_FALSE;

			if (cee->cbfn.get_attr_cbfn) {

				cee->cbfn.get_attr_cbfn(

					cee->cbfn.get_attr_cbarg,

					BFA_STATUS_FAILED);

			}

		}

		if (cee->get_stats_pending == BFA_TRUE) {

			cee->get_stats_status = BFA_STATUS_FAILED;

			cee->get_stats_pending  = BFA_FALSE;

			if (cee->cbfn.get_stats_cbfn) {

				cee->cbfn.get_stats_cbfn(

				cee->cbfn.get_stats_cbarg,

				BFA_STATUS_FAILED);

			}

		}

		if (cee->reset_stats_pending == BFA_TRUE) {

			cee->reset_stats_status = BFA_STATUS_FAILED;

			cee->reset_stats_pending  = BFA_FALSE;

			if (cee->cbfn.reset_stats_cbfn) {

				cee->cbfn.reset_stats_cbfn(

				cee->cbfn.reset_stats_cbarg,

				BFA_STATUS_FAILED);

			}

		}

		break;



	default:

		break;

	}

}



/*

 * bfa_cee_attach()

 *

 * @brief CEE module-attach API

 *

 * @param[in] cee - Pointer to the CEE module data structure

 *            ioc - Pointer to the ioc module data structure

 *            dev - Pointer to the device driver module data structure

 *                  The device driver specific mbox ISR functions have

 *                  this pointer as one of the parameters.

 *

 * @return void

 */

void

bfa_cee_attach(struct bfa_cee_s *cee, struct bfa_ioc_s *ioc,

		void *dev)

{

	WARN_ON(cee == NULL);

	cee->dev = dev;

	cee->ioc = ioc;



	bfa_ioc_mbox_regisr(cee->ioc, BFI_MC_CEE, bfa_cee_isr, cee);

	bfa_q_qe_init(&cee->ioc_notify);

	bfa_ioc_notify_init(&cee->ioc_notify, bfa_cee_notify, cee);

	list_add_tail(&cee->ioc_notify.qe, &cee->ioc->notify_q);

}

drivers/scsi/bfa/bfa_port.h

+54 −0
Original line number Diff line number Diff line
@@ -66,4 +66,58 @@ bfa_status_t bfa_port_disable(struct bfa_port_s *port, 
u32     bfa_port_meminfo(void);

void	     bfa_port_mem_claim(struct bfa_port_s *port,

				 u8 *dma_kva, u64 dma_pa);



/*

 * CEE declaration

 */

typedef void (*bfa_cee_get_attr_cbfn_t) (void *dev, bfa_status_t status);

typedef void (*bfa_cee_get_stats_cbfn_t) (void *dev, bfa_status_t status);

typedef void (*bfa_cee_reset_stats_cbfn_t) (void *dev, bfa_status_t status);



struct bfa_cee_cbfn_s {

	bfa_cee_get_attr_cbfn_t		get_attr_cbfn;

	void				*get_attr_cbarg;

	bfa_cee_get_stats_cbfn_t	get_stats_cbfn;

	void				*get_stats_cbarg;

	bfa_cee_reset_stats_cbfn_t	reset_stats_cbfn;

	void				*reset_stats_cbarg;

};



struct bfa_cee_s {

	void *dev;

	bfa_boolean_t		get_attr_pending;

	bfa_boolean_t		get_stats_pending;

	bfa_boolean_t		reset_stats_pending;

	bfa_status_t		get_attr_status;

	bfa_status_t		get_stats_status;

	bfa_status_t		reset_stats_status;

	struct bfa_cee_cbfn_s	cbfn;

	struct bfa_ioc_notify_s	ioc_notify;

	struct bfa_trc_mod_s	*trcmod;

	struct bfa_cee_attr_s	*attr;

	struct bfa_cee_stats_s	*stats;

	struct bfa_dma_s	attr_dma;

	struct bfa_dma_s	stats_dma;

	struct bfa_ioc_s	*ioc;

	struct bfa_mbox_cmd_s	get_cfg_mb;

	struct bfa_mbox_cmd_s	get_stats_mb;

	struct bfa_mbox_cmd_s	reset_stats_mb;

	struct bfa_mem_dma_s	cee_dma;

};



#define BFA_MEM_CEE_DMA(__bfa)	(&((__bfa)->modules.cee.cee_dma))



u32	bfa_cee_meminfo(void);

void	bfa_cee_mem_claim(struct bfa_cee_s *cee, u8 *dma_kva, u64 dma_pa);

void	bfa_cee_attach(struct bfa_cee_s *cee,

			struct bfa_ioc_s *ioc, void *dev);

bfa_status_t	bfa_cee_get_attr(struct bfa_cee_s *cee,

				struct bfa_cee_attr_s *attr,

				bfa_cee_get_attr_cbfn_t cbfn, void *cbarg);

bfa_status_t	bfa_cee_get_stats(struct bfa_cee_s *cee,

				struct bfa_cee_stats_s *stats,

				bfa_cee_get_stats_cbfn_t cbfn, void *cbarg);

bfa_status_t	bfa_cee_reset_stats(struct bfa_cee_s *cee,

				bfa_cee_reset_stats_cbfn_t cbfn, void *cbarg);



#endif	/* __BFA_PORT_H__ */