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

Commit f27dfa1e authored by Amir Levy's avatar Amir Levy Committed by Gerrit - the friendly Code Review server
Browse files

msm: ipa3: Add FnR hash tuple configuration support 



Added a utility functions to configure the tuple per filtering pipe
index or routing table index. Used the utility to configure the
default values without masking any value for AP tables.
Modem should configure his tables and pipes tuples.

Change-Id: Ia22c550a93861afd4a781dbe04b4664ba430c0e2
Signed-off-by: default avatarGhanim Fodi <gfodi@codeaurora.org>
Signed-off-by: default avatarAmir Levy <alevy@codeaurora.org>
parent 15e072fc

drivers/platform/msm/ipa/ipa_v3/ipa.c

+66 −0
Original line number Diff line number Diff line
@@ -2173,6 +2173,58 @@ int _ipa_init_flt6_v3(void) 
	return rc;

}



static int ipa3_setup_flt_hash_tuple(void)

{

	int pipe_idx;

	struct ipa3_hash_tuple tuple;



	memset(&tuple, 0, sizeof(struct ipa3_hash_tuple));



	for (pipe_idx = 0; pipe_idx < ipa3_ctx->ipa_num_pipes ; pipe_idx++) {

		if (!ipa_is_ep_support_flt(pipe_idx))

			continue;



		if (ipa_is_modem_pipe(pipe_idx))

			continue;



		if (ipa3_set_flt_tuple_mask(pipe_idx, &tuple)) {

			IPAERR("failed to setup pipe %d flt tuple\n", pipe_idx);

			return -EFAULT;

		}

	}



	return 0;

}



static int ipa3_setup_rt_hash_tuple(void)

{

	int tbl_idx;

	struct ipa3_hash_tuple tuple;



	memset(&tuple, 0, sizeof(struct ipa3_hash_tuple));



	for (tbl_idx = 0;

		tbl_idx < max(IPA_MEM_PART(v6_rt_num_index),

		IPA_MEM_PART(v4_rt_num_index));

		tbl_idx++) {



		if (tbl_idx >= IPA_MEM_PART(v4_modem_rt_index_lo) &&

			tbl_idx <= IPA_MEM_PART(v4_modem_rt_index_hi))

			continue;



		if (tbl_idx >= IPA_MEM_PART(v6_modem_rt_index_lo) &&

			tbl_idx <= IPA_MEM_PART(v6_modem_rt_index_hi))

			continue;



		if (ipa3_set_rt_tuple_mask(tbl_idx, &tuple)) {

			IPAERR("failed to setup tbl %d rt tuple\n", tbl_idx);

			return -EFAULT;

		}

	}



	return 0;

}



static int ipa3_setup_apps_pipes(void)

{

	struct ipa_sys_connect_params sys_in;
@@ -2210,6 +2262,20 @@ static int ipa3_setup_apps_pipes(void) 
	ipa3_ctx->ctrl->ipa_init_flt6();

	IPADBG("V6 FLT initialized\n");



	if (ipa3_setup_flt_hash_tuple()) {

		IPAERR(":fail to configure flt hash tuple\n");

		result = -EPERM;

		goto fail_schedule_delayed_work;

	}

	IPADBG("flt hash tuple is configured\n");



	if (ipa3_setup_rt_hash_tuple()) {

		IPAERR(":fail to configure rt hash tuple\n");

		result = -EPERM;

		goto fail_schedule_delayed_work;

	}

	IPADBG("rt hash tuple is configured\n");



	if (ipa3_setup_exception_path()) {

		IPAERR(":fail to setup excp path\n");

		result = -EPERM;

drivers/platform/msm/ipa/ipa_v3/ipa_flt.c

+97 −10
Original line number Diff line number Diff line
@@ -815,17 +815,10 @@ fail_desc_alloc: 
 */

static bool ipa_flt_skip_pipe_config(int pipe)

{

	int client_idx;



	for (client_idx = 0; client_idx < IPA_CLIENT_MAX; client_idx++) {

		if (!IPA_CLIENT_IS_Q6_CONS(client_idx) &&

			!IPA_CLIENT_IS_Q6_PROD(client_idx))

			continue;

		if (ipa3_get_ep_mapping(client_idx) == pipe) {

	if (ipa_is_modem_pipe(pipe)) {

		IPADBG("skip %d - modem owned pipe\n", pipe);

		return true;

	}

	}



	if (ipa3_ctx->skip_ep_cfg_shadow[pipe]) {

		IPADBG("skip %d\n", pipe);
@@ -1520,3 +1513,97 @@ void ipa3_delete_dflt_flt_rules(u32 ipa_ep_idx) 
	}

	mutex_unlock(&ipa3_ctx->lock);

}



static u32 ipa3_build_flt_tuple_mask(struct ipa3_hash_tuple *tpl)

{

	u32 msk = 0;



	IPA_SETFIELD_IN_REG(msk, tpl->src_id,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_SRC_ID_SHFT,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_SRC_ID_BMSK

		);



	IPA_SETFIELD_IN_REG(msk, tpl->src_ip_addr,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_SRC_IP_SHFT,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_SRC_IP_BMSK

		);



	IPA_SETFIELD_IN_REG(msk, tpl->dst_ip_addr,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_DST_IP_SHFT,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_DST_IP_BMSK

		);



	IPA_SETFIELD_IN_REG(msk, tpl->src_port,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_SRC_PORT_SHFT,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_SRC_PORT_BMSK

		);



	IPA_SETFIELD_IN_REG(msk, tpl->dst_port,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_DST_PORT_SHFT,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_DST_PORT_BMSK

		);



	IPA_SETFIELD_IN_REG(msk, tpl->protocol,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_PROTOCOL_SHFT,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_PROTOCOL_BMSK

		);



	IPA_SETFIELD_IN_REG(msk, tpl->meta_data,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_METADATA_SHFT,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_METADATA_BMSK

		);



	return msk;

}



/**

 * ipa3_set_flt_tuple_mask() - Sets the flt tuple masking for the given pipe

 *  Pipe must be for AP EP (not modem) and support filtering

 *  updates the the filtering masking values without changing the rt ones.

 *

 * @pipe_idx: filter pipe index to configure the tuple masking

 * @tuple: the tuple members masking

 * Returns:	0 on success, negative on failure

 *

 */

int ipa3_set_flt_tuple_mask(int pipe_idx, struct ipa3_hash_tuple *tuple)

{

	u32 val;

	u32 mask;



	if (!tuple) {

		IPAERR("bad tuple\n");

		return -EINVAL;

	}



	if (pipe_idx >= ipa3_ctx->ipa_num_pipes || pipe_idx < 0) {

		IPAERR("bad pipe index!\n");

		return -EINVAL;

	}



	if (!ipa_is_ep_support_flt(pipe_idx)) {

		IPAERR("pipe %d not filtering pipe\n", pipe_idx);

		return -EINVAL;

	}



	if (ipa_is_modem_pipe(pipe_idx)) {

		IPAERR("modem pipe tuple is not configured by AP\n");

		return -EINVAL;

	}



	val = ipa_read_reg(ipa3_ctx->mmio,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_OFST(pipe_idx));



	val &= 0xFFFF0000; /* clear 16 LSBs - flt bits */



	mask = ipa3_build_flt_tuple_mask(tuple);

	mask &= 0x0000FFFF;



	val |= mask;



	ipa_write_reg(ipa3_ctx->mmio,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_OFST(pipe_idx),

		val);



	return 0;

}

drivers/platform/msm/ipa/ipa_v3/ipa_i.h

+27 −0
Original line number Diff line number Diff line
@@ -1095,6 +1095,29 @@ struct ipa3_sps_pm { 
	bool res_rel_in_prog;

};



/**

 * struct ipa3_hash_tuple - Hash tuple members for flt and rt

 *  the fields tells if to be masked or not

 * @src_id: pipe number for flt, table index for rt

 * @src_ip_addr: IP source address

 * @dst_ip_addr: IP destination address

 * @src_port: L4 source port

 * @dst_port: L4 destination port

 * @protocol: IP protocol field

 * @meta_data: packet meta-data

 *

 */

struct ipa3_hash_tuple {

	/* src_id: pipe in flt, tbl index in rt */

	bool src_id;

	bool src_ip_addr;

	bool dst_ip_addr;

	bool src_port;

	bool dst_port;

	bool protocol;

	bool meta_data;

};



/**

 * struct ipa3_context - IPA context

 * @class: pointer to the struct class
@@ -1792,6 +1815,8 @@ bool ipa3_get_modem_cfg_emb_pipe_flt(void); 
int ipa3_bind_api_controller(enum ipa_hw_type ipa_hw_type,

	struct ipa_api_controller *api_ctrl);



bool ipa_is_modem_pipe(int pipe_idx);



int ipa3_send_one(struct ipa3_sys_context *sys, struct ipa3_desc *desc,

		bool in_atomic);

int ipa3_send(struct ipa3_sys_context *sys,
@@ -1982,5 +2007,7 @@ int ipa3_rm_add_dependency_sync(enum ipa_rm_resource_name resource_name, 
		enum ipa_rm_resource_name depends_on_name);

int ipa3_release_wdi_mapping(u32 num_buffers, struct ipa_wdi_buffer_info *info);

int ipa3_create_wdi_mapping(u32 num_buffers, struct ipa_wdi_buffer_info *info);

int ipa3_set_flt_tuple_mask(int pipe_idx, struct ipa3_hash_tuple *tuple);

int ipa3_set_rt_tuple_mask(int tbl_idx, struct ipa3_hash_tuple *tuple);



#endif /* _IPA3_I_H_ */

drivers/platform/msm/ipa/ipa_v3/ipa_reg.h

+30 −0
Original line number Diff line number Diff line
@@ -240,4 +240,34 @@ 
#define IPA_FILT_ROUT_HASH_FLUSH_IPv6_FILT_SHFT (4)

#define IPA_FILT_ROUT_HASH_FLUSH_IPv6_ROUT_SHFT (0)



#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_OFST(n) (0x00000854 + 0x60 * (n))

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_SRC_ID_SHFT 0

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_SRC_ID_BMSK 0x1

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_SRC_IP_SHFT 1

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_SRC_IP_BMSK 0x2

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_DST_IP_SHFT 2

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_DST_IP_BMSK 0x4

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_SRC_PORT_SHFT 3

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_SRC_PORT_BMSK 0x8

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_DST_PORT_SHFT 4

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_DST_PORT_BMSK 0x10

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_PROTOCOL_SHFT 5

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_PROTOCOL_BMSK 0x20

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_METADATA_SHFT 6

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_FILTER_HASH_MSK_METADATA_BMSK 0x40

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_SRC_ID_SHFT 16

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_SRC_ID_BMSK 0x10000

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_SRC_IP_SHFT 17

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_SRC_IP_BMSK 0x20000

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_DST_IP_SHFT 18

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_DST_IP_BMSK 0x40000

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_SRC_PORT_SHFT 19

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_SRC_PORT_BMSK 0x80000

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_DST_PORT_SHFT 20

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_DST_PORT_BMSK 0x100000

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_PROTOCOL_SHFT 21

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_PROTOCOL_BMSK 0x200000

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_METADATA_SHFT 22

#define IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_METADATA_BMSK 0x400000



#endif

drivers/platform/msm/ipa/ipa_v3/ipa_rt.c

+99 −0
Original line number Diff line number Diff line
@@ -1537,3 +1537,102 @@ bail: 


	return result;

}



static u32 ipa3_build_rt_tuple_mask(struct ipa3_hash_tuple *tpl)

{

	u32 msk = 0;



	IPA_SETFIELD_IN_REG(msk, tpl->src_id,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_SRC_ID_SHFT,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_SRC_ID_BMSK

		);



	IPA_SETFIELD_IN_REG(msk, tpl->src_ip_addr,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_SRC_IP_SHFT,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_SRC_IP_BMSK

		);



	IPA_SETFIELD_IN_REG(msk, tpl->dst_ip_addr,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_DST_IP_SHFT,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_DST_IP_BMSK

		);



	IPA_SETFIELD_IN_REG(msk, tpl->src_port,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_SRC_PORT_SHFT,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_SRC_PORT_BMSK

		);



	IPA_SETFIELD_IN_REG(msk, tpl->dst_port,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_DST_PORT_SHFT,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_DST_PORT_BMSK

		);



	IPA_SETFIELD_IN_REG(msk, tpl->protocol,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_PROTOCOL_SHFT,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_PROTOCOL_BMSK

		);



	IPA_SETFIELD_IN_REG(msk, tpl->meta_data,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_METADATA_SHFT,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_ROUTER_HASH_MSK_METADATA_BMSK

		);



	return msk;

}



/**

 * ipa3_set_rt_tuple_mask() - Sets the rt tuple masking for the given tbl

 *  table index must be for AP EP (not modem)

 *  updates the the routing masking values without changing the flt ones.

 *

 * @tbl_idx: routing table index to configure the tuple masking

 * @tuple: the tuple members masking

 * Returns:	0 on success, negative on failure

 *

 */

int ipa3_set_rt_tuple_mask(int tbl_idx, struct ipa3_hash_tuple *tuple)

{

	u32 val;

	u32 mask;



	if (!tuple) {

		IPAERR("bad tuple\n");

		return -EINVAL;

	}



	if (tbl_idx >=

		max(IPA_MEM_PART(v6_rt_num_index),

		IPA_MEM_PART(v4_rt_num_index)) ||

		tbl_idx < 0) {

		IPAERR("bad table index\n");

		return -EINVAL;

	}



	if (tbl_idx >= IPA_MEM_PART(v4_modem_rt_index_lo) &&

		tbl_idx <= IPA_MEM_PART(v4_modem_rt_index_hi)) {

		IPAERR("cannot configure modem v4 rt tuple by AP\n");

		return -EINVAL;

	}



	if (tbl_idx >= IPA_MEM_PART(v6_modem_rt_index_lo) &&

		tbl_idx <= IPA_MEM_PART(v6_modem_rt_index_hi)) {

		IPAERR("cannot configure modem v6 rt tuple by AP\n");

		return -EINVAL;

	}



	val = ipa_read_reg(ipa3_ctx->mmio,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_OFST(tbl_idx));



	val &= 0x0000FFFF; /* clear 16 MSBs - rt bits */



	mask = ipa3_build_rt_tuple_mask(tuple);

	mask &= 0xFFFF0000;



	val |= mask;



	ipa_write_reg(ipa3_ctx->mmio,

		IPA_ENDP_FILTER_ROUTER_HSH_CFG_n_OFST(tbl_idx),

		val);



	return 0;

}