Commit fa381e21 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Jakub Kicinski
Browse files

qed: Remove unused qed_calc_*_ctx_validation functions 



qed_calc_session_ctx_validation() and qed_calc_task_ctx_validation()
were added as part of 2017's
commit da090917 ("qed*: Utilize FW 8.33.1.0")

but have remained unused.

Remove them.

This leaves; con_region_offsets[], task_region_offsets[],
cdu_crc8_table and qed_calc_cdu_validation_byte() unused.

Remove them.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Link: https://patch.msgid.link/20250414005247.341243-3-linux@treblig.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e056d3d7

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

+0 −28
Original line number Diff line number Diff line
@@ -2666,34 +2666,6 @@ void qed_gft_config(struct qed_hwfn *p_hwfn, 
void qed_enable_context_validation(struct qed_hwfn *p_hwfn,

				   struct qed_ptt *p_ptt);



/**

 * qed_calc_session_ctx_validation(): Calcualte validation byte for

 *                                    session context.

 *

 * @p_ctx_mem: Pointer to context memory.

 * @ctx_size: Context size.

 * @ctx_type: Context type.

 * @cid: Context cid.

 *

 * Return: Void.

 */

void qed_calc_session_ctx_validation(void *p_ctx_mem,

				     u16 ctx_size, u8 ctx_type, u32 cid);



/**

 * qed_calc_task_ctx_validation(): Calcualte validation byte for task

 *                                 context.

 *

 * @p_ctx_mem: Pointer to context memory.

 * @ctx_size: Context size.

 * @ctx_type: Context type.

 * @tid: Context tid.

 *

 * Return: Void.

 */

void qed_calc_task_ctx_validation(void *p_ctx_mem,

				  u16 ctx_size, u8 ctx_type, u32 tid);



#define NUM_STORMS 6



/**

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

+0 −100
Original line number Diff line number Diff line
@@ -18,16 +18,6 @@ 


#define CDU_VALIDATION_DEFAULT_CFG CDU_CONTEXT_VALIDATION_DEFAULT_CFG



static u16 con_region_offsets[3][NUM_OF_CONNECTION_TYPES] = {

	{400, 336, 352, 368, 304, 384, 416, 352},	/* region 3 offsets */

	{528, 496, 416, 512, 448, 512, 544, 480},	/* region 4 offsets */

	{608, 544, 496, 576, 576, 592, 624, 560}	/* region 5 offsets */

};



static u16 task_region_offsets[1][NUM_OF_CONNECTION_TYPES] = {

	{240, 240, 112, 0, 0, 0, 0, 96}	/* region 1 offsets */

};



/* General constants */

#define QM_PQ_MEM_4KB(pq_size)	(pq_size ? DIV_ROUND_UP((pq_size + 1) *	\

							QM_PQ_ELEMENT_SIZE, \
@@ -1576,96 +1566,6 @@ void qed_gft_config(struct qed_hwfn *p_hwfn, 
	qed_wr(p_hwfn, p_ptt, PRS_REG_SEARCH_GFT, 1);

}



DECLARE_CRC8_TABLE(cdu_crc8_table);



/* Calculate and return CDU validation byte per connection type/region/cid */

static u8 qed_calc_cdu_validation_byte(u8 conn_type, u8 region, u32 cid)

{

	const u8 validation_cfg = CDU_VALIDATION_DEFAULT_CFG;

	u8 crc, validation_byte = 0;

	static u8 crc8_table_valid; /* automatically initialized to 0 */

	u32 validation_string = 0;

	__be32 data_to_crc;



	if (!crc8_table_valid) {

		crc8_populate_msb(cdu_crc8_table, 0x07);

		crc8_table_valid = 1;

	}



	/* The CRC is calculated on the String-to-compress:

	 * [31:8]  = {CID[31:20],CID[11:0]}

	 * [7:4]   = Region

	 * [3:0]   = Type

	 */

	if ((validation_cfg >> CDU_CONTEXT_VALIDATION_CFG_USE_CID) & 1)

		validation_string |= (cid & 0xFFF00000) | ((cid & 0xFFF) << 8);



	if ((validation_cfg >> CDU_CONTEXT_VALIDATION_CFG_USE_REGION) & 1)

		validation_string |= ((region & 0xF) << 4);



	if ((validation_cfg >> CDU_CONTEXT_VALIDATION_CFG_USE_TYPE) & 1)

		validation_string |= (conn_type & 0xF);



	/* Convert to big-endian and calculate CRC8 */

	data_to_crc = cpu_to_be32(validation_string);

	crc = crc8(cdu_crc8_table, (u8 *)&data_to_crc, sizeof(data_to_crc),

		   CRC8_INIT_VALUE);



	/* The validation byte [7:0] is composed:

	 * for type A validation

	 * [7]          = active configuration bit

	 * [6:0]        = crc[6:0]

	 *

	 * for type B validation

	 * [7]          = active configuration bit

	 * [6:3]        = connection_type[3:0]

	 * [2:0]        = crc[2:0]

	 */

	validation_byte |=

	    ((validation_cfg >>

	      CDU_CONTEXT_VALIDATION_CFG_USE_ACTIVE) & 1) << 7;



	if ((validation_cfg >>

	     CDU_CONTEXT_VALIDATION_CFG_VALIDATION_TYPE_SHIFT) & 1)

		validation_byte |= ((conn_type & 0xF) << 3) | (crc & 0x7);

	else

		validation_byte |= crc & 0x7F;



	return validation_byte;

}



/* Calcualte and set validation bytes for session context */

void qed_calc_session_ctx_validation(void *p_ctx_mem,

				     u16 ctx_size, u8 ctx_type, u32 cid)

{

	u8 *x_val_ptr, *t_val_ptr, *u_val_ptr, *p_ctx;



	p_ctx = (u8 * const)p_ctx_mem;

	x_val_ptr = &p_ctx[con_region_offsets[0][ctx_type]];

	t_val_ptr = &p_ctx[con_region_offsets[1][ctx_type]];

	u_val_ptr = &p_ctx[con_region_offsets[2][ctx_type]];



	memset(p_ctx, 0, ctx_size);



	*x_val_ptr = qed_calc_cdu_validation_byte(ctx_type, 3, cid);

	*t_val_ptr = qed_calc_cdu_validation_byte(ctx_type, 4, cid);

	*u_val_ptr = qed_calc_cdu_validation_byte(ctx_type, 5, cid);

}



/* Calcualte and set validation bytes for task context */

void qed_calc_task_ctx_validation(void *p_ctx_mem,

				  u16 ctx_size, u8 ctx_type, u32 tid)

{

	u8 *p_ctx, *region1_val_ptr;



	p_ctx = (u8 * const)p_ctx_mem;

	region1_val_ptr = &p_ctx[task_region_offsets[0][ctx_type]];



	memset(p_ctx, 0, ctx_size);



	*region1_val_ptr = qed_calc_cdu_validation_byte(ctx_type, 1, tid);

}



/* Enable and configure context validation */

void qed_enable_context_validation(struct qed_hwfn *p_hwfn,

				   struct qed_ptt *p_ptt)