Merge "msm: ipa3: Remove ep_delay on disconnect sequence" (c7851323) · Commits · e / devices / android_kernel_xiaomi_markw

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -2220,6 +2220,7 @@ static int ipa_usb_xdci_dismiss_channels(u32 ul_clnt_hdl, u32 dl_clnt_hdl,
		}

		if (!IPA3_USB_IS_TTYPE_DPL(ttype)) {
		ipa3_xdci_ep_delay_rm(ul_clnt_hdl); /* Remove ep_delay if set */
		/* Reset UL channel */
		result = ipa3_reset_gsi_channel(ul_clnt_hdl);
		if (result) {

+42 −0

Original line number	Diff line number	Diff line
		@@ -1768,6 +1768,48 @@ exit:
		return result;
		}

		void ipa3_xdci_ep_delay_rm(u32 clnt_hdl)
		{
		struct ipa3_ep_context *ep;
		struct ipa_ep_cfg_ctrl ep_cfg_ctrl;
		int result;

		if (clnt_hdl >= ipa3_ctx->ipa_num_pipes \|\|
		ipa3_ctx->ep[clnt_hdl].valid == 0) {
		IPAERR("bad parm.\n");
		return;
		}

		ep = &ipa3_ctx->ep[clnt_hdl];

		if (ep->ep_delay_set == true) {

		memset(&ep_cfg_ctrl, 0 , sizeof(struct ipa_ep_cfg_ctrl));
		ep_cfg_ctrl.ipa_ep_delay = false;

		if (!ep->keep_ipa_awake)
		IPA_ACTIVE_CLIENTS_INC_EP
		(ipa3_get_client_mapping(clnt_hdl));

		result = ipa3_cfg_ep_ctrl(clnt_hdl,
		&ep_cfg_ctrl);

		if (!ep->keep_ipa_awake)
		IPA_ACTIVE_CLIENTS_DEC_EP
		(ipa3_get_client_mapping(clnt_hdl));

		if (result) {
		IPAERR
		("client (ep: %d) failed to remove delay result=%d\n",
		clnt_hdl, result);
		} else {
		IPADBG("client (ep: %d) delay removed\n",
		clnt_hdl);
		ep->ep_delay_set = false;
		}
		}
		}

		int ipa3_xdci_disconnect(u32 clnt_hdl, bool should_force_clear, u32 qmi_req_id)
		{
		struct ipa3_ep_context *ep;

+2 −0

Original line number	Diff line number	Diff line
		@@ -1513,6 +1513,8 @@ int ipa3_xdci_connect(u32 clnt_hdl);

		int ipa3_xdci_disconnect(u32 clnt_hdl, bool should_force_clear, u32 qmi_req_id);

		void ipa3_xdci_ep_delay_rm(u32 clnt_hdl);

		int ipa3_xdci_suspend(u32 ul_clnt_hdl, u32 dl_clnt_hdl,
		bool should_force_clear, u32 qmi_req_id, bool is_dpl);