Merge "msm: ipa: add support for new uC opcode" (38b99bcc) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/platform/msm/ipa/ipa_api.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -172,6 +172,7 @@ const char *ipa_clients_strings[IPA_CLIENT_MAX] = {
	__stringify(IPA_CLIENT_TEST2_CONS),		__stringify(IPA_CLIENT_TEST2_CONS),
	__stringify(IPA_CLIENT_TEST3_CONS),		__stringify(IPA_CLIENT_TEST3_CONS),
	__stringify(IPA_CLIENT_TEST4_CONS),		__stringify(IPA_CLIENT_TEST4_CONS),
			__stringify(IPA_CLIENT_DUMMY_CONS),
	};		};

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -198,6 +198,7 @@ static const int ep_mapping[3][IPA_CLIENT_MAX] = {
	[IPA_2_0][IPA_CLIENT_TEST2_CONS] = 16,		[IPA_2_0][IPA_CLIENT_TEST2_CONS] = 16,
	[IPA_2_0][IPA_CLIENT_TEST3_CONS] = 13,		[IPA_2_0][IPA_CLIENT_TEST3_CONS] = 13,
	[IPA_2_0][IPA_CLIENT_TEST4_CONS] = 15,		[IPA_2_0][IPA_CLIENT_TEST4_CONS] = 15,
			[IPA_2_0][IPA_CLIENT_DUMMY_CONS] = -1,


	[IPA_2_6L][IPA_CLIENT_HSIC1_PROD] = -1,		[IPA_2_6L][IPA_CLIENT_HSIC1_PROD] = -1,
	@@ -275,6 +276,7 @@ static const int ep_mapping[3][IPA_CLIENT_MAX] = {
	[IPA_2_6L][IPA_CLIENT_TEST2_CONS] = 0,		[IPA_2_6L][IPA_CLIENT_TEST2_CONS] = 0,
	[IPA_2_6L][IPA_CLIENT_TEST3_CONS] = 1,		[IPA_2_6L][IPA_CLIENT_TEST3_CONS] = 1,
	[IPA_2_6L][IPA_CLIENT_TEST4_CONS] = 10,		[IPA_2_6L][IPA_CLIENT_TEST4_CONS] = 10,
			[IPA_2_6L][IPA_CLIENT_DUMMY_CONS] = -1,
	};		};

	static struct msm_bus_vectors ipa_init_vectors_v1_1[] = {		static struct msm_bus_vectors ipa_init_vectors_v1_1[] = {

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -81,6 +81,8 @@ const char *ipa3_hdr_proc_type_name[] = {
	__stringify(IPA_HDR_PROC_ETHII_TO_802_3),		__stringify(IPA_HDR_PROC_ETHII_TO_802_3),
	__stringify(IPA_HDR_PROC_802_3_TO_ETHII),		__stringify(IPA_HDR_PROC_802_3_TO_ETHII),
	__stringify(IPA_HDR_PROC_802_3_TO_802_3),		__stringify(IPA_HDR_PROC_802_3_TO_802_3),
			__stringify(IPA_HDR_PROC_L2TP_HEADER_ADD),
			__stringify(IPA_HDR_PROC_L2TP_HEADER_REMOVE),
	};		};

	static struct dentry *dent;		static struct dentry *dent;

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,7 @@
	#include "ipa_i.h"		#include "ipa_i.h"
	#include "ipahal/ipahal.h"		#include "ipahal/ipahal.h"

	static const u32 ipa_hdr_bin_sz[IPA_HDR_BIN_MAX] = { 8, 16, 24, 36, 60};		static const u32 ipa_hdr_bin_sz[IPA_HDR_BIN_MAX] = { 8, 16, 24, 36, 64};
	static const u32 ipa_hdr_proc_ctx_bin_sz[IPA_HDR_PROC_CTX_BIN_MAX] = { 32, 64};		static const u32 ipa_hdr_proc_ctx_bin_sz[IPA_HDR_PROC_CTX_BIN_MAX] = { 32, 64};

	#define HDR_TYPE_IS_VALID(type) \		#define HDR_TYPE_IS_VALID(type) \
	@@ -77,7 +77,8 @@ static void ipa3_hdr_proc_ctx_to_hw_format(struct ipa_mem_buffer *mem,
	entry->hdr->is_hdr_proc_ctx,		entry->hdr->is_hdr_proc_ctx,
	entry->hdr->phys_base,		entry->hdr->phys_base,
	hdr_base_addr,		hdr_base_addr,
	entry->hdr->offset_entry);		entry->hdr->offset_entry,
			entry->l2tp_params);
	}		}
	}		}

	@@ -354,6 +355,7 @@ static int __ipa_add_hdr_proc_ctx(struct ipa_hdr_proc_ctx_add *proc_ctx,

	entry->type = proc_ctx->type;		entry->type = proc_ctx->type;
	entry->hdr = hdr_entry;		entry->hdr = hdr_entry;
			entry->l2tp_params = proc_ctx->l2tp_params;
	if (add_ref_hdr)		if (add_ref_hdr)
	hdr_entry->ref_cnt++;		hdr_entry->ref_cnt++;
	entry->cookie = IPA_COOKIE;		entry->cookie = IPA_COOKIE;

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -370,7 +370,8 @@ struct ipa3_hdr_proc_ctx_offset_entry {
	/**		/**
	struct ipa3_hdr_proc_ctx_entry - IPA processing context header table entry		struct ipa3_hdr_proc_ctx_entry - IPA processing context header table entry
	* @link: entry's link in global header table entries list		* @link: entry's link in global header table entries list
	* @type:		* @type: header processing context type
			* @l2tp_params: L2TP parameters
	* @offset_entry: entry's offset		* @offset_entry: entry's offset
	* @hdr: the header		* @hdr: the header
	* @cookie: cookie used for validity check		* @cookie: cookie used for validity check
	@@ -381,6 +382,7 @@ struct ipa3_hdr_proc_ctx_offset_entry {
	struct ipa3_hdr_proc_ctx_entry {		struct ipa3_hdr_proc_ctx_entry {
	struct list_head link;		struct list_head link;
	enum ipa_hdr_proc_type type;		enum ipa_hdr_proc_type type;
			union ipa_l2tp_hdr_proc_ctx_params l2tp_params;
	struct ipa3_hdr_proc_ctx_offset_entry *offset_entry;		struct ipa3_hdr_proc_ctx_offset_entry *offset_entry;
	struct ipa3_hdr_entry *hdr;		struct ipa3_hdr_entry *hdr;
	u32 cookie;		u32 cookie;