Merge "msm: ipa3: remove delay from AP if QMI fails"

This commit is contained in:
Linux Build Service Account 2017-06-27 04:28:14 -07:00 committed by Gerrit - the friendly Code Review server
commit 29a036e74e

View file

@ -1668,8 +1668,21 @@ static int ipa3_stop_ul_chan_with_data_drain(u32 qmi_req_id,
if (should_force_clear) {
result = ipa3_enable_force_clear(qmi_req_id, false,
source_pipe_bitmask);
if (result)
goto exit;
if (result) {
struct ipahal_ep_cfg_ctrl_scnd ep_ctrl_scnd = { 0 };
/*
* assuming here modem SSR\shutdown, AP can remove
* the delay in this case
*/
IPAERR(
"failed to force clear %d, remove delay from SCND reg\n"
, result);
ep_ctrl_scnd.endp_delay = false;
ipahal_write_reg_n_fields(
IPA_ENDP_INIT_CTRL_SCND_n, clnt_hdl,
&ep_ctrl_scnd);
}
}
/* with force clear, wait for emptiness */
for (i = 0; i < IPA_POLL_FOR_EMPTINESS_NUM; i++) {