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

Commit 50a20714 authored by Mintz, Yuval's avatar Mintz, Yuval Committed by David S. Miller
Browse files

qed: Hold a single array for SBs 



A PF today holds 2 different arrays - one holding information
about the HW configuration and one holding information about
the SBs that are used by the protocol drivers.
These arrays aren't really connected - e.g., protocol driver
initializing a given SB would not mark the same SB as occupied
in the HW shadow array.

Move into a single array [at least for PFs] - hold the mapping
of the driver-protocol SBs on the HW entry which they configure.

Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 09b6b147

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

+0 −4
Original line number Diff line number Diff line
@@ -495,10 +495,6 @@ struct qed_hwfn { 
	bool b_rdma_enabled_in_prs;

	u32 rdma_prs_search_reg;



	/* Array of sb_info of all status blocks */

	struct qed_sb_info		*sbs_info[MAX_SB_PER_PF_MIMD];

	u16				num_sbs;



	struct qed_cxt_mngr		*p_cxt_mngr;



	/* Flag indicating whether interrupts are enabled or not*/

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

+4 −1
Original line number Diff line number Diff line
@@ -183,7 +183,10 @@ qed_sp_fcoe_func_start(struct qed_hwfn *p_hwfn, 
	p_data->q_params.queue_relative_offset = (u8)tmp;



	for (i = 0; i < fcoe_pf_params->num_cqs; i++) {

		tmp = cpu_to_le16(p_hwfn->sbs_info[i]->igu_sb_id);

		u16 igu_sb_id;



		igu_sb_id = qed_get_igu_sb_id(p_hwfn, i);

		tmp = cpu_to_le16(igu_sb_id);

		p_data->q_params.cq_cmdq_sb_num_arr[i] = tmp;

	}

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

+36 −10
Original line number Diff line number Diff line
@@ -1452,7 +1452,7 @@ static u16 qed_get_pf_igu_sb_id(struct qed_hwfn *p_hwfn, u16 vector_id) 
	return QED_SB_INVALID_IDX;

}



static u16 qed_get_igu_sb_id(struct qed_hwfn *p_hwfn, u16 sb_id)

u16 qed_get_igu_sb_id(struct qed_hwfn *p_hwfn, u16 sb_id)

{

	u16 igu_sb_id;
@@ -1485,8 +1485,19 @@ int qed_int_sb_init(struct qed_hwfn *p_hwfn, 
	sb_info->igu_sb_id = qed_get_igu_sb_id(p_hwfn, sb_id);



	if (sb_id != QED_SP_SB_ID) {

		p_hwfn->sbs_info[sb_id] = sb_info;

		p_hwfn->num_sbs++;

		if (IS_PF(p_hwfn->cdev)) {

			struct qed_igu_info *p_info;

			struct qed_igu_block *p_block;



			p_info = p_hwfn->hw_info.p_igu_info;

			p_block = &p_info->entry[sb_info->igu_sb_id];



			p_block->sb_info = sb_info;

			p_block->status &= ~QED_IGU_STATUS_FREE;

			p_info->usage.free_cnt--;

		} else {

			qed_vf_set_sb_info(p_hwfn, sb_id, sb_info);

		}

	}



	sb_info->cdev = p_hwfn->cdev;
@@ -1515,20 +1526,35 @@ int qed_int_sb_init(struct qed_hwfn *p_hwfn, 
int qed_int_sb_release(struct qed_hwfn *p_hwfn,

		       struct qed_sb_info *sb_info, u16 sb_id)

{

	if (sb_id == QED_SP_SB_ID) {

		DP_ERR(p_hwfn, "Do Not free sp sb using this function");

		return -EINVAL;

	}

	struct qed_igu_block *p_block;

	struct qed_igu_info *p_info;



	if (!sb_info)

		return 0;



	/* zero status block and ack counter */

	sb_info->sb_ack = 0;

	memset(sb_info->sb_virt, 0, sizeof(*sb_info->sb_virt));



	if (p_hwfn->sbs_info[sb_id] != NULL) {

		p_hwfn->sbs_info[sb_id] = NULL;

		p_hwfn->num_sbs--;

	if (IS_VF(p_hwfn->cdev)) {

		qed_vf_set_sb_info(p_hwfn, sb_id, NULL);

		return 0;

	}



	p_info = p_hwfn->hw_info.p_igu_info;

	p_block = &p_info->entry[sb_info->igu_sb_id];



	/* Vector 0 is reserved to Default SB */

	if (!p_block->vector_number) {

		DP_ERR(p_hwfn, "Do Not free sp sb using this function");

		return -EINVAL;

	}



	/* Lose reference to client's SB info, and fix counters */

	p_block->sb_info = NULL;

	p_block->status |= QED_IGU_STATUS_FREE;

	p_info->usage.free_cnt++;



	return 0;

}

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

+17 −6
Original line number Diff line number Diff line
@@ -214,6 +214,8 @@ struct qed_igu_block { 


	/* Index inside IGU [meant for back reference] */

	u16 igu_sb_id;



	struct qed_sb_info *sb_info;

};



struct qed_igu_info {
@@ -224,7 +226,16 @@ struct qed_igu_info { 


};



/* TODO Names of function may change... */

/**

 * @brief Translate the weakly-defined client sb-id into an IGU sb-id

 *

 * @param p_hwfn

 * @param sb_id - user provided sb_id

 *

 * @return an index inside IGU CAM where the SB resides

 */

u16 qed_get_igu_sb_id(struct qed_hwfn *p_hwfn, u16 sb_id);



/**

 * @brief return a pointer to an unused valid SB

 *

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

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ qed_sp_iscsi_func_start(struct qed_hwfn *p_hwfn, 
	p_queue->cmdq_sb_pi = p_params->gl_cmd_pi;



	for (i = 0; i < p_params->num_queues; i++) {

		val = p_hwfn->sbs_info[i]->igu_sb_id;

		val = qed_get_igu_sb_id(p_hwfn, i);

		p_queue->cq_cmdq_sb_num_arr[i] = cpu_to_le16(val);

	}