align with ipa driver in kernel

As IPA driver moved to techpack, align with kernel version

Change-Id: Ifc3e0d40b6d54f0828fd4c4afc3b8e51a3ec7ffe
Signed-off-by: Amir Levy <[email protected]>

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

@@ -1653,7 +1653,7 @@ connect_ul_fail:
 	if (ipa3_is_mhip_offload_enabled())
 		ipa_mpm_mhip_xdci_pipe_disable(params->teth_prot);
 connect_fail:
-		ipa_pm_deactivate_sync(
+	ipa_pm_deactivate_sync(
 			ipa3_usb_ctx->ttype_ctx[ttype].pm_ctx.hdl);
 
 	return result;

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

@@ -3869,18 +3869,18 @@ int _ipa_init_sram_v3(void)
 	}
 	if (ipa_get_hw_type() >= IPA_HW_v4_0) {
 		if (ipa_get_hw_type() < IPA_HW_v4_5) {
-		ipa3_sram_set_canary(ipa_sram_mmio,
-			IPA_MEM_PART(pdn_config_ofst) - 4);
-		ipa3_sram_set_canary(ipa_sram_mmio,
-			IPA_MEM_PART(pdn_config_ofst));
-		ipa3_sram_set_canary(ipa_sram_mmio,
+			ipa3_sram_set_canary(ipa_sram_mmio,
+				IPA_MEM_PART(pdn_config_ofst) - 4);
+			ipa3_sram_set_canary(ipa_sram_mmio,
+				IPA_MEM_PART(pdn_config_ofst));
+			ipa3_sram_set_canary(ipa_sram_mmio,
 				IPA_MEM_PART(stats_quota_q6_ofst) - 4);
-		ipa3_sram_set_canary(ipa_sram_mmio,
+			ipa3_sram_set_canary(ipa_sram_mmio,
 				IPA_MEM_PART(stats_quota_q6_ofst));
 		} else {
 			ipa3_sram_set_canary(ipa_sram_mmio,
 				IPA_MEM_PART(stats_quota_q6_ofst) - 12);
-	}
+		}
 	}
 
 	if (ipa_get_hw_type() <= IPA_HW_v3_5 ||

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

@@ -659,7 +659,7 @@ static int ipa3_attrib_dump(struct ipa_rule_attrib *attrib,
 			dbg_buff + nbytes,
 			IPA_MAX_MSG_LEN - nbytes,
 			"\n");
-	return 0;
+	return nbytes;
 }
 
 static int ipa3_attrib_dump_eq(struct ipa_ipfltri_rule_eq *attrib,
@@ -939,7 +939,8 @@ static ssize_t ipa3_read_rt(struct file *file, char __user *ubuf, size_t count,
 					entry->rule.retain_hdr);
 			}
 
-			ipa3_attrib_dump(&entry->rule.attrib, ip, nbytes);
+			nbytes = ipa3_attrib_dump(&entry->rule.attrib,
+							ip, nbytes);
 			i++;
 		}
 	}
@@ -1241,7 +1242,7 @@ static ssize_t ipa3_read_flt(struct file *file, char __user *ubuf, size_t count,
 					goto bail;
 				}
 			} else
-				ipa3_attrib_dump(
+				nbytes = ipa3_attrib_dump(
 					&entry->rule.attrib, ip, nbytes);
 			i++;
 			nbytes += scnprintf(

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

@@ -2927,7 +2927,7 @@ static const struct ipa_ep_configuration ipa3_ep_mapping
 			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP,
 			QMB_MASTER_SELECT_DDR,
 			{ 2, 2, 16, 32, IPA_EE_AP, GSI_SMART_PRE_FETCH, 8 } },
-	[IPA_4_9][IPA_CLIENT_WLAN1_PROD]          = {
+	[IPA_4_9][IPA_CLIENT_WLAN2_PROD]          = {
 			true, IPA_v4_9_GROUP_UL_DL,
 			true,
 			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP,
@@ -3001,7 +3001,7 @@ static const struct ipa_ep_configuration ipa3_ep_mapping
 			IPA_DPS_HPS_SEQ_TYPE_INVALID,
 			QMB_MASTER_SELECT_DDR,
 			{ 23, 15, 8, 14, IPA_EE_AP, GSI_SMART_PRE_FETCH, 2 } },
-	[IPA_4_9][IPA_CLIENT_WLAN1_CONS]          = {
+	[IPA_4_9][IPA_CLIENT_WLAN2_CONS]          = {
 			true, IPA_v4_9_GROUP_UL_DL,
 			false,
 			IPA_DPS_HPS_SEQ_TYPE_INVALID,