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

Commit 472cf8f2 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa3: Support uc header proc ctx for DSCP insertion"

parents 3e8d042b 5d0b7069

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

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ const char *ipa3_hdr_proc_type_name[] = { 
	__stringify(IPA_HDR_PROC_ETHII_TO_ETHII_EX),

	__stringify(IPA_HDR_PROC_L2TP_UDP_HEADER_ADD),

	__stringify(IPA_HDR_PROC_L2TP_UDP_HEADER_REMOVE),

	__stringify(IPA_HDR_PROC_SET_DSCP),

};



static struct dentry *dent;

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

+6 −0
Original line number Diff line number Diff line
@@ -1428,6 +1428,9 @@ static int ipahal_cp_proc_ctx_to_hw_buff_v3(enum ipa_hdr_proc_type type, 
		case IPA_HDR_PROC_802_3_TO_802_3:

			ctx->cmd.value = IPA_HDR_UCP_802_3_TO_802_3;

			break;

		case IPA_HDR_PROC_SET_DSCP:

			ctx->cmd.value = IPA_HDR_UCP_SET_DSCP;

			break;

		default:

			IPAHAL_ERR("unknown ipa_hdr_proc_type %d", type);

			WARN_ON(1);
@@ -1480,6 +1483,9 @@ static int ipahal_get_proc_ctx_needed_len_v3(enum ipa_hdr_proc_type type) 
	case IPA_HDR_PROC_ETHII_TO_ETHII_EX:

		ret = sizeof(struct ipa_hw_hdr_proc_ctx_add_hdr_cmd_seq_ex);

		break;

	case IPA_HDR_PROC_SET_DSCP:

		ret = sizeof(struct ipa_hw_hdr_proc_ctx_add_hdr_cmd_seq);

		break;

	default:

		/* invalid value to make sure failure */

		IPAHAL_ERR_RL("invalid ipa_hdr_proc_type %d\n", type);

drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_i.h

+1 −0
Original line number Diff line number Diff line
@@ -624,6 +624,7 @@ struct ipa_pkt_status_hw { 
#define IPA_HDR_UCP_L2TP_UDP_HEADER_ADD		12

#define IPA_HDR_UCP_L2TP_UDP_HEADER_REMOVE	13

#define IPA_HDR_UCP_ETHII_TO_ETHII_EX		14

#define IPA_HDR_UCP_SET_DSCP		16



/* Processing context TLV type */

#define IPA_PROC_CTX_TLV_TYPE_END 0

include/uapi/linux/msm_ipa.h

+3 −2
Original line number Diff line number Diff line
@@ -1184,9 +1184,10 @@ enum ipa_hdr_proc_type { 
	IPA_HDR_PROC_L2TP_HEADER_REMOVE,

	IPA_HDR_PROC_ETHII_TO_ETHII_EX,

	IPA_HDR_PROC_L2TP_UDP_HEADER_ADD,

	IPA_HDR_PROC_L2TP_UDP_HEADER_REMOVE

	IPA_HDR_PROC_L2TP_UDP_HEADER_REMOVE,

	IPA_HDR_PROC_SET_DSCP,

};

#define IPA_HDR_PROC_MAX (IPA_HDR_PROC_L2TP_UDP_HEADER_REMOVE + 1)

#define IPA_HDR_PROC_MAX (IPA_HDR_PROC_SET_DSCP + 1)



/**

 * struct ipa_rt_rule - attributes of a routing rule