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

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

Merge "msm:ipa: rename QMAP flow control pipe enum"

parents 93c31f7f 692e614d

drivers/platform/msm/ipa/ipa_api.c

+2 −2
Original line number Diff line number Diff line
@@ -220,8 +220,8 @@ const char *ipa_clients_strings[IPA_CLIENT_MAX] = { 
	__stringify(IPA_CLIENT_MHI2_CONS),

	__stringify(IPA_CLIENT_Q6_CV2X_PROD),

	__stringify(IPA_CLIENT_Q6_CV2X_CONS),

	__stringify(IPA_CLIENT_MHI_QMAP_PROD),

	__stringify(IPA_CLIENT_MHI_QMAP_CONS),

	__stringify(IPA_CLIENT_MHI_LOW_LAT_PROD),

	__stringify(IPA_CLIENT_MHI_LOW_LAT_CONS),

	__stringify(RESERVERD_PROD_110),

	__stringify(IPA_CLIENT_MHI_QDSS_CONS),

};

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

+2 −2
Original line number Diff line number Diff line
@@ -2602,7 +2602,7 @@ static const struct ipa_ep_configuration ipa3_ep_mapping 
			IPA_DPS_HPS_SEQ_TYPE_DMA_ONLY,

			QMB_MASTER_SELECT_DDR,

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

	[IPA_4_5_MHI][IPA_CLIENT_MHI_QMAP_PROD] = {

	[IPA_4_5_MHI][IPA_CLIENT_MHI_LOW_LAT_PROD] = {

			true, IPA_v4_5_MHI_GROUP_PCIE,

			false,

			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP,
@@ -2694,7 +2694,7 @@ static const struct ipa_ep_configuration ipa3_ep_mapping 
			IPA_DPS_HPS_SEQ_TYPE_INVALID,

			QMB_MASTER_SELECT_PCIE,

			{ 22, 2, 5, 5, IPA_EE_AP, GSI_ESCAPE_BUF_ONLY, 0 } },

	[IPA_4_5_MHI][IPA_CLIENT_MHI_QMAP_CONS] = {

	[IPA_4_5_MHI][IPA_CLIENT_MHI_LOW_LAT_CONS] = {

			true, IPA_v4_5_MHI_GROUP_PCIE,

			false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID,

drivers/platform/msm/mhi_dev/mhi.c

+2 −2
Original line number Diff line number Diff line
@@ -1319,10 +1319,10 @@ static int mhi_hwc_chcmd(struct mhi_dev *mhi, uint chid, 
			connect_params.sys.client = IPA_CLIENT_MHI2_CONS;

			break;

		case MHI_CLIENT_QMAP_FLOW_CTRL_OUT:

			connect_params.sys.client = IPA_CLIENT_MHI_QMAP_PROD;

			connect_params.sys.client = IPA_CLIENT_MHI_LOW_LAT_PROD;

			break;

		case MHI_CLIENT_QMAP_FLOW_CTRL_IN:

			connect_params.sys.client = IPA_CLIENT_MHI_QMAP_CONS;

			connect_params.sys.client = IPA_CLIENT_MHI_LOW_LAT_CONS;

			break;

		default:

			pr_err("Invalid channel = 0x%X\n", chid);

include/uapi/linux/msm_ipa.h

+4 −4
Original line number Diff line number Diff line
@@ -403,8 +403,8 @@ enum ipa_client_type { 
	IPA_CLIENT_Q6_CV2X_PROD	= 106,

	IPA_CLIENT_Q6_CV2X_CONS	= 107,



	IPA_CLIENT_MHI_QMAP_PROD = 108,

	IPA_CLIENT_MHI_QMAP_CONS = 109,

	IPA_CLIENT_MHI_LOW_LAT_PROD = 108,

	IPA_CLIENT_MHI_LOW_LAT_CONS = 109,



	/* RESERVERD PROD					= 110, */

	IPA_CLIENT_MHI_QDSS_CONS = 111,
@@ -526,8 +526,8 @@ enum ipa_client_type { 
	(client) == IPA_CLIENT_MHI_PROD || \

	(client) == IPA_CLIENT_MHI2_PROD || \

	(client) == IPA_CLIENT_MHI2_CONS || \

	(client) == IPA_CLIENT_MHI_QMAP_PROD || \

	(client) == IPA_CLIENT_MHI_QMAP_CONS || \

	(client) == IPA_CLIENT_MHI_LOW_LAT_PROD || \

	(client) == IPA_CLIENT_MHI_LOW_LAT_CONS || \

	(client) == IPA_CLIENT_MHI_DPL_CONS || \

	(client) == IPA_CLIENT_MHI_QDSS_CONS)