Merge "msm: ipa: APQ related fixes"

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

@@ -7277,6 +7277,7 @@ static void ipa3_load_ipa_fw(struct work_struct *work)
 		if (result) {
 			IPAERR("IPA uC loading process has failed result=%d\n",
 				result);
+			ipa3_proxy_clk_unvote();
 			return;
 		}
 		IPADBG("IPA uC loading succeeded\n");
@@ -8298,7 +8299,8 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p,
 		goto fail_wwan_init;
 	}
 
-	if (ipa3_ctx->rmnet_ctl_enable) {
+	if (ipa3_ctx->rmnet_ctl_enable &&
+		ipa3_ctx->platform_type != IPA_PLAT_TYPE_APQ) {
 		result = ipa3_rmnet_ctl_init();
 		if (result) {
 			IPAERR(":ipa3_rmnet_ctl_init err=%d\n", -result);

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

@@ -1116,6 +1116,7 @@ static int ipa_mpm_connect_mhip_gsi_pipe(enum ipa_client_type mhip_client,
 	gsi_params.chan_params.ring_base_vaddr = NULL;
 	gsi_params.chan_params.use_db_eng = GSI_CHAN_DIRECT_MODE;
 	gsi_params.chan_params.max_prefetch = GSI_ONE_PREFETCH_SEG;
+	gsi_params.chan_params.db_in_bytes = 1;
 	gsi_params.chan_params.low_weight = 1;
 	gsi_params.chan_params.xfer_cb = NULL;
 	gsi_params.chan_params.err_cb = ipa_mpm_gsi_chan_err_cb;

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

@@ -4877,7 +4877,7 @@ static const struct ipa_ep_configuration ipa3_ep_mapping
 			IPA_DPS_HPS_SEQ_TYPE_INVALID,
 			QMB_MASTER_SELECT_DDR,
 			{ 31, 8, 9, 9, IPA_EE_AP, GSI_SMART_PRE_FETCH, 3 },
-			IPA_TX_INSTANCE_DL },
+			IPA_TX_INSTANCE_UL },
 	[IPA_5_1_APQ][IPA_CLIENT_APPS_LAN_CONS] = {
 			true, IPA_v5_0_GROUP_UL,
 			false,