diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-27 04:28:14 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-27 04:28:14 -0700 |
| commit | 29a036e74e70a5054ff2077d3f5d1b95377b5c70 (patch) | |
| tree | 21a0e6612e68b2822372baa2108449a27b9b6687 | |
| parent | 3fb86ecd813c606d1e98bd9895a5f4490916a64f (diff) | |
| parent | 9d56022bb622889e298ac3a0272bfa3b3010f7d5 (diff) | |
Merge "msm: ipa3: remove delay from AP if QMI fails"
| -rw-r--r-- | drivers/platform/msm/ipa/ipa_v3/ipa_client.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_client.c b/drivers/platform/msm/ipa/ipa_v3/ipa_client.c index e349ade46075..bc6622d4725b 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa_client.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa_client.c @@ -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++) { |