Commit fb09a1ed authored by Shai Malin's avatar Shai Malin Committed by David S. Miller
Browse files

qed: Remove e4_ and _e4 from FW HSI 



The existing qed/qede/qedr/qedi/qedf code uses chip-specific naming in
structures,  functions, variables and defines in FW HSI (Hardware
Software Interface).

The new FW version introduced a generic naming convention in HSI
in-which the same code will be used across different versions
for simpler maintainability. It also eases in providing support for
new features.

With this patch every "_e4" or "e4_" prefix or suffix is not needed
anymore and it will be removed.

Reviewed-by: default avatarManish Rangankar <mrangankar@marvell.com>
Reviewed-by: default avatarJaved Hasan <jhasan@marvell.com>
Signed-off-by: default avatarAriel Elior <aelior@marvell.com>
Signed-off-by: default avatarOmkar Kulkarni <okulkarni@marvell.com>
Signed-off-by: default avatarShai Malin <smalin@marvell.com>
Signed-off-by: default avatarPrabhakar Kushwaha <pkushwaha@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 19198e4e

drivers/infiniband/hw/qedr/main.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static int qedr_register_device(struct qedr_dev *dev) 
static int qedr_alloc_mem_sb(struct qedr_dev *dev,

			     struct qed_sb_info *sb_info, u16 sb_id)

{

	struct status_block_e4 *sb_virt;

	struct status_block *sb_virt;

	dma_addr_t sb_phys;

	int rc;

drivers/net/ethernet/qlogic/qed/qed.h

+1 −3
Original line number Diff line number Diff line
@@ -703,8 +703,6 @@ struct qed_dev { 
#define QED_IS_BB_B0(dev)		(QED_IS_BB(dev) && CHIP_REV_IS_B0(dev))

#define QED_IS_AH(dev)			((dev)->type == QED_DEV_TYPE_AH)

#define QED_IS_K2(dev)			QED_IS_AH(dev)

#define QED_IS_E4(dev)			(QED_IS_BB(dev) || QED_IS_AH(dev))

#define QED_IS_E5(dev)			((dev)->type == QED_DEV_TYPE_E5)



	u16				vendor_id;
@@ -903,7 +901,7 @@ static inline u8 qed_concrete_to_sw_fid(struct qed_dev *cdev, 
}



#define PKT_LB_TC	9

#define MAX_NUM_VOQS_E4	20

#define MAX_NUM_VOQS	20



int qed_configure_vport_wfq(struct qed_dev *cdev, u16 vp_id, u32 rate);

void qed_configure_vp_wfq_on_link_change(struct qed_dev *cdev,

drivers/net/ethernet/qlogic/qed/qed_cxt.c

+8 −8
Original line number Diff line number Diff line
@@ -54,22 +54,22 @@ 


/* connection context union */

union conn_context {

	struct e4_core_conn_context core_ctx;

	struct e4_eth_conn_context eth_ctx;

	struct e4_iscsi_conn_context iscsi_ctx;

	struct e4_fcoe_conn_context fcoe_ctx;

	struct e4_roce_conn_context roce_ctx;

	struct core_conn_context core_ctx;

	struct eth_conn_context eth_ctx;

	struct iscsi_conn_context iscsi_ctx;

	struct fcoe_conn_context fcoe_ctx;

	struct roce_conn_context roce_ctx;

};



/* TYPE-0 task context - iSCSI, FCOE */

union type0_task_context {

	struct e4_iscsi_task_context iscsi_ctx;

	struct e4_fcoe_task_context fcoe_ctx;

	struct iscsi_task_context iscsi_ctx;

	struct fcoe_task_context fcoe_ctx;

};



/* TYPE-1 task context - ROCE */

union type1_task_context {

	struct e4_rdma_task_context roce_ctx;

	struct rdma_task_context roce_ctx;

};



struct src_ent {

drivers/net/ethernet/qlogic/qed/qed_debug.c

+4 −4
Original line number Diff line number Diff line
@@ -4744,9 +4744,9 @@ static u32 qed_ilt_dump(struct qed_hwfn *p_hwfn, 
	offset += qed_dump_section_hdr(dump_buf + offset,

				       dump, "num_pf_cids_per_conn_type", 1);

	offset += qed_dump_num_param(dump_buf + offset,

				     dump, "size", NUM_OF_CONNECTION_TYPES_E4);

				     dump, "size", NUM_OF_CONNECTION_TYPES);

	for (conn_type = 0, valid_conn_pf_cids = 0;

	     conn_type < NUM_OF_CONNECTION_TYPES_E4; conn_type++, offset++) {

	     conn_type < NUM_OF_CONNECTION_TYPES; conn_type++, offset++) {

		u32 num_pf_cids =

		    p_hwfn->p_cxt_mngr->conn_cfg[conn_type].cid_count;
@@ -4759,9 +4759,9 @@ static u32 qed_ilt_dump(struct qed_hwfn *p_hwfn, 
	offset += qed_dump_section_hdr(dump_buf + offset,

				       dump, "num_vf_cids_per_conn_type", 1);

	offset += qed_dump_num_param(dump_buf + offset,

				     dump, "size", NUM_OF_CONNECTION_TYPES_E4);

				     dump, "size", NUM_OF_CONNECTION_TYPES);

	for (conn_type = 0, valid_conn_vf_cids = 0;

	     conn_type < NUM_OF_CONNECTION_TYPES_E4; conn_type++, offset++) {

	     conn_type < NUM_OF_CONNECTION_TYPES; conn_type++, offset++) {

		u32 num_vf_cids =

		    p_hwfn->p_cxt_mngr->conn_cfg[conn_type].cids_per_vf;

drivers/net/ethernet/qlogic/qed/qed_fcoe.c

+5 −5
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ qed_sp_fcoe_func_start(struct qed_hwfn *p_hwfn, 
	struct qed_fcoe_pf_params *fcoe_pf_params = NULL;

	struct fcoe_init_ramrod_params *p_ramrod = NULL;

	struct fcoe_init_func_ramrod_data *p_data;

	struct e4_fcoe_conn_context *p_cxt = NULL;

	struct fcoe_conn_context *p_cxt = NULL;

	struct qed_spq_entry *p_ent = NULL;

	struct qed_sp_init_data init_data;

	struct qed_cxt_info cxt_info;
@@ -144,7 +144,7 @@ qed_sp_fcoe_func_start(struct qed_hwfn *p_hwfn, 
	memset(p_cxt, 0, sizeof(*p_cxt));



	SET_FIELD(p_cxt->tstorm_ag_context.flags3,

		  E4_TSTORM_FCOE_CONN_AG_CTX_DUMMY_TIMER_CF_EN, 1);

		  TSTORM_FCOE_CONN_AG_CTX_DUMMY_TIMER_CF_EN, 1);



	fcoe_pf_params->dummy_icid = (u16)dummy_cid;
@@ -549,7 +549,7 @@ int qed_fcoe_alloc(struct qed_hwfn *p_hwfn) 


void qed_fcoe_setup(struct qed_hwfn *p_hwfn)

{

	struct e4_fcoe_task_context *p_task_ctx = NULL;

	struct fcoe_task_context *p_task_ctx = NULL;

	u32 i, lc;

	int rc;
@@ -561,7 +561,7 @@ void qed_fcoe_setup(struct qed_hwfn *p_hwfn) 
		if (rc)

			continue;



		memset(p_task_ctx, 0, sizeof(struct e4_fcoe_task_context));

		memset(p_task_ctx, 0, sizeof(struct fcoe_task_context));



		lc = 0;

		SET_FIELD(lc, TIMERS_CONTEXT_VALIDLC0, 1);
@@ -572,7 +572,7 @@ void qed_fcoe_setup(struct qed_hwfn *p_hwfn) 
		p_task_ctx->timer_context.logical_client_1 = cpu_to_le32(lc);



		SET_FIELD(p_task_ctx->tstorm_ag_context.flags0,

			  E4_TSTORM_FCOE_TASK_AG_CTX_CONNECTION_TYPE, 1);

			  TSTORM_FCOE_TASK_AG_CTX_CONNECTION_TYPE, 1);

	}

}