summaryrefslogtreecommitdiff
path: root/drivers/platform
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-12-30 06:27:22 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-30 06:27:22 -0800
commit5e8d18d9d8223c3f81d282bdb20880540188ceff (patch)
tree10be2e874590abb5bf31bcaeea17355523a6d30f /drivers/platform
parent31a6ac888af4aa6e09defc6146ee6d47f4a634a6 (diff)
parentd87908003d3e7a32d3c21ca7a6a2307193719ba0 (diff)
Merge "msm: ipa3: Suspend Q6 pipes again during SSR POST_SHUTDOWN"
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/msm/ipa/ipa_v3/ipa.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa.c b/drivers/platform/msm/ipa/ipa_v3/ipa.c
index 2101147e7d24..214ae08234a9 100644
--- a/drivers/platform/msm/ipa/ipa_v3/ipa.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa.c
@@ -2301,13 +2301,17 @@ void ipa3_q6_post_shutdown_cleanup(void)
int client_idx;
IPADBG_LOW("ENTER\n");
- IPA_ACTIVE_CLIENTS_INC_SIMPLE();
if (!ipa3_ctx->uc_ctx.uc_loaded) {
IPAERR("uC is not loaded. Skipping\n");
return;
}
+ IPA_ACTIVE_CLIENTS_INC_SIMPLE();
+
+ /* Handle the issue where SUSPEND was removed for some reason */
+ ipa3_q6_avoid_holb();
+
for (client_idx = 0; client_idx < IPA_CLIENT_MAX; client_idx++)
if (IPA_CLIENT_IS_Q6_PROD(client_idx)) {
if (ipa3_uc_is_gsi_channel_empty(client_idx)) {