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

Commit 5508b951 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: allocate pipe #10 for LTE-WIFI AGGR for IPA2.6"

parents a585df01 ed2ff2ec

drivers/platform/msm/ipa/ipa_v2/ipa_utils.c

+5 −2
Original line number Diff line number Diff line
@@ -167,13 +167,15 @@ static const int ep_mapping[3][IPA_CLIENT_MAX] = { 
	[IPA_2_0][IPA_CLIENT_MHI_CONS]           = 17,

	[IPA_2_0][IPA_CLIENT_Q6_LAN_CONS]        =  8,

	[IPA_2_0][IPA_CLIENT_Q6_WAN_CONS]        =  9,

	[IPA_2_0][IPA_CLIENT_Q6_DUN_CONS]        = 10,

	[IPA_2_0][IPA_CLIENT_Q6_DUN_CONS]        = -1,

	[IPA_2_0][IPA_CLIENT_Q6_DECOMP_CONS]     = -1,

	[IPA_2_0][IPA_CLIENT_Q6_DECOMP2_CONS]    = -1,

	[IPA_2_0][IPA_CLIENT_MEMCPY_DMA_SYNC_CONS]

						 =  13,

	[IPA_2_0][IPA_CLIENT_MEMCPY_DMA_ASYNC_CONS]

						 =  16,

	[IPA_2_0][IPA_CLIENT_Q6_LTE_WIFI_AGGR_CONS]

						 =  10,

	/* Only for test purpose */

	[IPA_2_0][IPA_CLIENT_TEST_CONS]          = 1,

	[IPA_2_0][IPA_CLIENT_TEST1_CONS]         = 1,
@@ -207,7 +209,6 @@ static const int ep_mapping[3][IPA_CLIENT_MAX] = { 
						 =  -1,

	[IPA_2_6L][IPA_CLIENT_MEMCPY_DMA_ASYNC_PROD]

						 =  -1,



	/* Only for test purpose */

	[IPA_2_6L][IPA_CLIENT_TEST_PROD]          = 11,

	[IPA_2_6L][IPA_CLIENT_TEST1_PROD]         = 11,
@@ -246,6 +247,8 @@ static const int ep_mapping[3][IPA_CLIENT_MAX] = { 
						 =  -1,

	[IPA_2_6L][IPA_CLIENT_MEMCPY_DMA_ASYNC_CONS]

						 =  -1,

	[IPA_2_6L][IPA_CLIENT_Q6_LTE_WIFI_AGGR_CONS]

						 =  -1,

	/* Only for test purpose */

	[IPA_2_6L][IPA_CLIENT_TEST_CONS]          = 15,

	[IPA_2_6L][IPA_CLIENT_TEST1_CONS]         = 15,

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

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ static const struct ipa_ep_configuration ipa3_ep_mapping 
					= {28, IPA_GROUP_DMA, false},

	[IPA_3_0][IPA_CLIENT_MEMCPY_DMA_ASYNC_CONS]

					= {29, IPA_GROUP_DMA, false},

	[IPA_3_0][IPA_CLIENT_Q6_LTE_WIFI_AGGR_CONS]     = IPA_CLIENT_NOT_USED,

	/* Only for test purpose */

	[IPA_3_0][IPA_CLIENT_TEST_CONS]           = {16, IPA_GROUP_DL, false},

	[IPA_3_0][IPA_CLIENT_TEST1_CONS]          = {16, IPA_GROUP_DL, false},

include/uapi/linux/msm_ipa.h

+3 −1
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ enum ipa_client_type { 
	IPA_CLIENT_MEMCPY_DMA_ASYNC_CONS,

	IPA_CLIENT_Q6_DECOMP_CONS,

	IPA_CLIENT_Q6_DECOMP2_CONS,

	IPA_CLIENT_Q6_LTE_WIFI_AGGR_CONS,

	/* Below CONS client type is only for test purpose */

	IPA_CLIENT_TEST_CONS,

	IPA_CLIENT_TEST1_CONS,
@@ -228,7 +229,8 @@ enum ipa_client_type { 
	(client) == IPA_CLIENT_Q6_WAN_CONS || \

	(client) == IPA_CLIENT_Q6_DUN_CONS || \

	(client) == IPA_CLIENT_Q6_DECOMP_CONS || \

	(client) == IPA_CLIENT_Q6_DECOMP2_CONS)

	(client) == IPA_CLIENT_Q6_DECOMP2_CONS || \

	(client) == IPA_CLIENT_Q6_LTE_WIFI_AGGR_CONS)



#define IPA_CLIENT_IS_Q6_PROD(client) \

	((client) == IPA_CLIENT_Q6_LAN_PROD || \