evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: ipa3: retry on IPA_HW_CONS_DISABLE_CMD_GSI_STOP_FAILURE"

Browse source
This commit is contained in:
Linux Build Service Account 2016-11-15 04:07:58 -08:00 • committed by Gerrit - the friendly Code Review server
commit 1e17007652
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/platform/msm/ipa/ipa_v3/ipa_uc.c
View file

@ -585,7 +585,9 @@ send_cmd:
if (ipa3_ctx->uc_ctx.uc_status != expected_status) { if (ipa3_ctx->uc_ctx.uc_status != expected_status) {
if (ipa3_ctx->uc_ctx.uc_status == if (ipa3_ctx->uc_ctx.uc_status ==
IPA_HW_PROD_DISABLE_CMD_GSI_STOP_FAILURE) { IPA_HW_PROD_DISABLE_CMD_GSI_STOP_FAILURE ||
ipa3_ctx->uc_ctx.uc_status ==
IPA_HW_CONS_DISABLE_CMD_GSI_STOP_FAILURE) {
retries++; retries++;
if (retries == IPA_GSI_CHANNEL_STOP_MAX_RETRY) { if (retries == IPA_GSI_CHANNEL_STOP_MAX_RETRY) {
IPAERR("Failed after %d tries\n", retries); IPAERR("Failed after %d tries\n", retries);
@ -594,6 +596,8 @@ send_cmd:
return -EFAULT; return -EFAULT;
} }
IPA3_UC_UNLOCK(flags); IPA3_UC_UNLOCK(flags);
if (ipa3_ctx->uc_ctx.uc_status ==
IPA_HW_PROD_DISABLE_CMD_GSI_STOP_FAILURE)
ipa3_inject_dma_task_for_gsi(); ipa3_inject_dma_task_for_gsi();
/* sleep for short period to flush IPA */ /* sleep for short period to flush IPA */
usleep_range(IPA_GSI_CHANNEL_STOP_SLEEP_MIN_USEC, usleep_range(IPA_GSI_CHANNEL_STOP_SLEEP_MIN_USEC,