Merge "msm: ipa3: Disable HOLB for ODL pipe during suspend"

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

@@ -1860,6 +1860,12 @@ int ipa_drop_stats_init(void)
 		&reg_idx);
 	pipe_bitmask[reg_idx] |= mask;
 
+	/* Always enable drop stats for ODL DPL Pipe. */
+	mask = ipa_hw_stats_get_ep_bit_n_idx(
+		IPA_CLIENT_ODL_DPL_CONS,
+		&reg_idx);
+	pipe_bitmask[reg_idx] |= mask;
+
 	/* Currently we have option to enable drop stats using debugfs.
 	 * To enable drop stats for a different pipe, first user needs
 	 * to query drop stats to get the current stats and enable.

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

@@ -11065,6 +11065,8 @@ void ipa3_force_close_coal(void)
 int ipa3_suspend_apps_pipes(bool suspend)
 {
 	int res, i;
+	struct ipa_ep_cfg_holb holb_cfg;
+	int odl_ep_idx;
 
 	/* As per HPG first need start/stop coalescing channel
 	 * then default one. Coalescing client number was greater then
@@ -11086,6 +11088,24 @@ int ipa3_suspend_apps_pipes(bool suspend)
 	if (res == -EAGAIN)
 		goto undo_odl_cons;
 
+	odl_ep_idx = ipa3_get_ep_mapping(IPA_CLIENT_ODL_DPL_CONS);
+	if (odl_ep_idx != IPA_EP_NOT_ALLOCATED && ipa3_ctx->ep[odl_ep_idx].valid) {
+		memset(&holb_cfg, 0, sizeof(holb_cfg));
+		if (suspend)
+			holb_cfg.en = 0;
+		else
+			holb_cfg.en = 1;
+
+		ipahal_write_reg_n_fields(IPA_ENDP_INIT_HOL_BLOCK_EN_n,
+				odl_ep_idx, &holb_cfg);
+		/* IPA4.5 issue requires HOLB_EN to be written twice */
+		if (ipa3_ctx->ipa_hw_type >= IPA_HW_v4_5 && holb_cfg.en)
+			ipahal_write_reg_n_fields(
+					IPA_ENDP_INIT_HOL_BLOCK_EN_n,
+					odl_ep_idx, &holb_cfg);
+
+	}
+
 	res = _ipa_suspend_resume_pipe(IPA_CLIENT_APPS_WAN_LOW_LAT_CONS,
 		suspend);
 	if (res == -EAGAIN)