From 2d91294e6a7ec272e2aba65b004ab42021a4be13 Mon Sep 17 00:00:00 2001 From: raghavendar rao l Date: Mon, 4 Jan 2021 16:43:38 +0530 Subject: [PATCH] msm: gsi: Updated the wait for completion time out Increased the wait for completion timeout period, while performing channel halt. Change-Id: I42d56480d815e5ba6deb5c68ec2a9ba43cea39f7 Signed-off-by: raghavedar rao l --- drivers/platform/msm/gsi/gsi.c | 2 +- drivers/platform/msm/ipa/ipa_v3/ipa.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/platform/msm/gsi/gsi.c b/drivers/platform/msm/gsi/gsi.c index d831379ea229..c7259f3b37f3 100644 --- a/drivers/platform/msm/gsi/gsi.c +++ b/drivers/platform/msm/gsi/gsi.c @@ -4505,7 +4505,7 @@ int gsi_halt_channel_ee(unsigned int chan_idx, unsigned int ee, int *code) GSI_EE_n_GSI_EE_GENERIC_CMD_OFFS(gsi_ctx->per.ee)); res = wait_for_completion_timeout(&gsi_ctx->gen_ee_cmd_compl, - msecs_to_jiffies(GSI_CMD_TIMEOUT)); + msecs_to_jiffies(GSI_STOP_CMD_TIMEOUT_MS)); if (res == 0) { GSIERR("chan_idx=%u ee=%u timed out\n", chan_idx, ee); res = -GSI_STATUS_TIMED_OUT; diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa.c b/drivers/platform/msm/ipa/ipa_v3/ipa.c index a7e63baea081..72b97c16d82c 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa.c @@ -3424,16 +3424,18 @@ static void ipa3_halt_q6_gsi_channels(bool prod) gsi_ep_cfg->ipa_gsi_chan_num, gsi_ep_cfg->ee, &code); } - if (ret == GSI_STATUS_SUCCESS) + if (ret == GSI_STATUS_SUCCESS) { IPADBG("halted gsi ch %d ee %d with code %d\n", gsi_ep_cfg->ipa_gsi_chan_num, gsi_ep_cfg->ee, code); - else + } else { IPAERR("failed to halt ch %d ee %d code %d\n", gsi_ep_cfg->ipa_gsi_chan_num, gsi_ep_cfg->ee, code); + ipa_assert(); + } } } }