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

Commit 38bbe0e1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: bug on tag timeout"

parents fdb3930a 989c926d

drivers/platform/msm/ipa/ipa_v2/ipa_client.c

+8 −2
Original line number Diff line number Diff line
@@ -83,8 +83,14 @@ int ipa_disable_data_path(u32 clnt_hdl) 
	aggr_init = ipa_read_reg(ipa_ctx->mmio,

			IPA_ENDP_INIT_AGGR_N_OFST_v2_0(clnt_hdl));

	if (((aggr_init & IPA_ENDP_INIT_AGGR_N_AGGR_EN_BMSK) >>

	    IPA_ENDP_INIT_AGGR_N_AGGR_EN_SHFT) == IPA_ENABLE_AGGR)

		ipa_tag_aggr_force_close(clnt_hdl);

	    IPA_ENDP_INIT_AGGR_N_AGGR_EN_SHFT) == IPA_ENABLE_AGGR) {

		res = ipa_tag_aggr_force_close(clnt_hdl);

		if (res) {

			IPAERR("tag process timeout, client:%d err:%d\n",

				clnt_hdl, res);

			BUG();

		}

	}



	return res;

}

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

+8 −2
Original line number Diff line number Diff line
@@ -108,8 +108,14 @@ int ipa3_disable_data_path(u32 clnt_hdl) 
	aggr_init = ipa_read_reg(ipa3_ctx->mmio,

			IPA_ENDP_INIT_AGGR_N_OFST_v3_0(clnt_hdl));

	if (((aggr_init & IPA_ENDP_INIT_AGGR_N_AGGR_EN_BMSK) >>

	    IPA_ENDP_INIT_AGGR_N_AGGR_EN_SHFT) == IPA_ENABLE_AGGR)

		ipa3_tag_aggr_force_close(clnt_hdl);

	    IPA_ENDP_INIT_AGGR_N_AGGR_EN_SHFT) == IPA_ENABLE_AGGR) {

		res = ipa3_tag_aggr_force_close(clnt_hdl);

		if (res) {

			IPAERR("tag process timeout, client:%d err:%d\n",

				   clnt_hdl, res);

			BUG();

		}

	}



	return res;

}