Merge "msm: ipa: update the MHI channel for qmap flow control"

drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c

@@ -1210,20 +1210,20 @@ static enum ipa_client_type ipa3_mhi_get_client_by_chid(u32 chid)
 		client = IPA_CLIENT_MHI_CONS;
 		break;
 	case IPA_MHI_CLIENT_IP_HW_1_OUT:
-	/* IPA4.5 non-auto, use mhi ch104 for qmap flow control */
-		if (ipa_get_hw_type() == IPA_HW_v4_5)
+	/* >=IPA4.5 non-auto, use mhi ch105 for qmap flow control */
+		if (!ipa3_ctx->ipa_config_is_auto &&
+			ipa3_ctx->ipa_hw_type >= IPA_HW_v4_5)
 			client = IPA_CLIENT_MHI_LOW_LAT_PROD;
-		/* No auto use case in this branch */
 		else
-			client = IPA_CLIENT_MAX;
+			client = IPA_CLIENT_MHI2_PROD;
 		break;
 	case IPA_MHI_CLIENT_IP_HW_1_IN:
-	/* IPA4.5 non-auto, use mhi ch105 for qmap flow control */
-		if (ipa_get_hw_type() == IPA_HW_v4_5)
+	/* >=IPA4.5 non-auto, use mhi ch106 for qmap flow control */
+		if (!ipa3_ctx->ipa_config_is_auto &&
+			ipa3_ctx->ipa_hw_type >= IPA_HW_v4_5)
 			client = IPA_CLIENT_MHI_LOW_LAT_CONS;
-		/* No auto use case in this branch */
 		else
-			client = IPA_CLIENT_MAX;
+			client = IPA_CLIENT_MHI2_CONS;
 		break;
 	case IPA_MHI_CLIENT_QMAP_FLOW_CTRL_OUT:
 		client = IPA_CLIENT_MHI_LOW_LAT_PROD;

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

@@ -3801,12 +3801,12 @@ static const struct ipa_ep_configuration ipa3_ep_mapping
 			QMB_MASTER_SELECT_DDR,
 			{ 2 , 11, 25, 32, IPA_EE_AP, GSI_SMART_PRE_FETCH, 3},
 			IPA_TX_INSTANCE_NA },
-	[IPA_5_0_MHI][IPA_CLIENT_APPS_WAN_LOW_LAT_PROD] = {
-			true,   IPA_v5_0_GROUP_URLLC,
+	[IPA_5_0_MHI][IPA_CLIENT_MHI_LOW_LAT_PROD] = {
+			true, IPA_v5_0_GROUP_URLLC,
 			false,
-			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP,
+			IPA_DPS_HPS_SEQ_TYPE_PKT_PROCESS_NO_DEC_UCP,
 			QMB_MASTER_SELECT_DDR,
-			{ 4 , 9 , 16, 24, IPA_EE_AP, GSI_SMART_PRE_FETCH, 3},
+			{ 10, 5, 10, 16, IPA_EE_AP, GSI_SMART_PRE_FETCH, 3},
 			IPA_TX_INSTANCE_NA },
 	[IPA_5_0_MHI][IPA_CLIENT_MEMCPY_DMA_SYNC_PROD] ={
 			true,   IPA_v5_0_GROUP_DMA,
@@ -3942,12 +3942,12 @@ static const struct ipa_ep_configuration ipa3_ep_mapping
 			QMB_MASTER_SELECT_PCIE,
 			{ 30, 24, 5 , 5 , IPA_EE_AP, GSI_ESCAPE_BUF_ONLY, 0},
 			IPA_TX_INSTANCE_DL },
-	[IPA_5_0_MHI][IPA_CLIENT_APPS_WAN_LOW_LAT_CONS] = {
+	[IPA_5_0_MHI][IPA_CLIENT_MHI_LOW_LAT_CONS] = {
 			true, IPA_v5_0_GROUP_URLLC,
 			false,
 			IPA_DPS_HPS_SEQ_TYPE_INVALID,
 			QMB_MASTER_SELECT_PCIE,
-			{ 32, 10, 9 , 9 , IPA_EE_AP, GSI_SMART_PRE_FETCH, 3},
+			{ 33, 6, 9 , 9 , IPA_EE_AP, GSI_SMART_PRE_FETCH, 3},
 			IPA_TX_INSTANCE_DL },
 	[IPA_5_0_MHI][IPA_CLIENT_ODU_EMB_CONS] = {
 			true, IPA_v5_0_GROUP_UL,