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

Commit 6e1ff0c2 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: IPA EP mapping for AQC ethernet on IPA v4.5"

parents 297b2c48 b6263b4b

drivers/platform/msm/ipa/ipa_api.c

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -208,6 +208,8 @@ const char *ipa_clients_strings[IPA_CLIENT_MAX] = { 
	__stringify(IPA_CLIENT_WIGIG_CONS3),

	__stringify(RESERVERD_PROD_94),

	__stringify(IPA_CLIENT_WIGIG_CONS4),

	__stringify(IPA_CLIENT_AQC_ETHERNET_PROD),

	__stringify(IPA_CLIENT_AQC_ETHERNET_CONS),

};



/**

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

+12 −0
Original line number Diff line number Diff line
@@ -2247,6 +2247,12 @@ static const struct ipa_ep_configuration ipa3_ep_mapping 
			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_DEC_UCP,

			QMB_MASTER_SELECT_DDR,

			{ 8, 2, 27, 32, IPA_EE_Q6, GSI_FREE_PRE_FETCH, 3 } },

	[IPA_4_5][IPA_CLIENT_AQC_ETHERNET_PROD] = {

			true, IPA_v4_5_GROUP_UL_DL_SRC,

			true,

			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP,

			QMB_MASTER_SELECT_DDR,

			{ 10, 13, 8, 16, IPA_EE_AP, GSI_ESCAPE_BUF_ONLY, 0 } },

	/* Only for test purpose */

	[IPA_4_5][IPA_CLIENT_TEST_PROD]           = {

			true, IPA_v4_5_GROUP_UL_DL_SRC,
@@ -2363,6 +2369,12 @@ static const struct ipa_ep_configuration ipa3_ep_mapping 
			IPA_DPS_HPS_SEQ_TYPE_INVALID,

			QMB_MASTER_SELECT_DDR,

			{ 18, 4, 9, 9, IPA_EE_Q6, GSI_ESCAPE_BUF_ONLY, 0 } },

	[IPA_4_5][IPA_CLIENT_AQC_ETHERNET_CONS] = {

			true, IPA_v4_5_GROUP_UL_DL_DST,

			false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID,

			QMB_MASTER_SELECT_DDR,

			{ 23, 8, 9, 9, IPA_EE_AP, GSI_SMART_PRE_FETCH, 4 } },

	/* Only for test purpose */

	/* MBIM aggregation test pipes should have the same QMB as USB_CONS */

	[IPA_4_5][IPA_CLIENT_TEST_CONS]           = {

include/uapi/linux/msm_ipa.h

+6 −1
Original line number Diff line number Diff line
@@ -336,9 +336,12 @@ enum ipa_client_type { 
	IPA_CLIENT_WIGIG3_CONS			= 93,

	/* RESERVERD PROD			= 94, */

	IPA_CLIENT_WIGIG4_CONS			= 95,



	IPA_CLIENT_AQC_ETHERNET_PROD		= 96,

	IPA_CLIENT_AQC_ETHERNET_CONS		= 97,

};



#define IPA_CLIENT_MAX (IPA_CLIENT_WIGIG4_CONS + 1)

#define IPA_CLIENT_MAX (IPA_CLIENT_AQC_ETHERNET_CONS + 1)



#define IPA_CLIENT_WLAN2_PROD IPA_CLIENT_A5_WLAN_AMPDU_PROD

#define IPA_CLIENT_Q6_DL_NLO_DATA_PROD IPA_CLIENT_Q6_DL_NLO_DATA_PROD
@@ -352,6 +355,8 @@ enum ipa_client_type { 
#define IPA_CLIENT_WIGIG2_CONS IPA_CLIENT_WIGIG2_CONS

#define IPA_CLIENT_WIGIG3_CONS IPA_CLIENT_WIGIG3_CONS

#define IPA_CLIENT_WIGIG4_CONS IPA_CLIENT_WIGIG4_CONS

#define IPA_CLIENT_AQC_ETHERNET_PROD IPA_CLIENT_AQC_ETHERNET_PROD

#define IPA_CLIENT_AQC_ETHERNET_CONS IPA_CLIENT_AQC_ETHERNET_CONS



#define IPA_CLIENT_IS_APPS_CONS(client) \

	((client) == IPA_CLIENT_APPS_LAN_CONS || \