lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: ipa: Fix holb event log handling

Browse Source 
When we get a bad peripheral event from uC when there is a pending
HOLB ADD/DEL command response from uC we will run into a deadlock
if we try to acquire mutex as part of event log. Make a change
to remove mutex lock when logging the events.

Change-Id: I60ca3ecc4fe4d090278f745bdf2bb9e1bd09ca60
Signed-off-by: Chaitanya Pratapa <cpratapa@codeaurora.org>
This commit is contained in:
Chaitanya Pratapa 2020-07-20 22:43:31 -07:00
parent 5d58e67d7c
commit ed74f973da
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/platform/msm/ipa/ipa_v3/ipa_uc_holb_monitor.c
View File

@ -218,11 +218,17 @@ void ipa3_uc_holb_event_log(uint16_t gsi_ch, bool enable,
if (!ipa3_ctx->uc_ctx.ipa_use_uc_holb_monitor) if (!ipa3_ctx->uc_ctx.ipa_use_uc_holb_monitor)
return; return;
mutex_lock(&ipa3_ctx->uc_ctx.holb_monitor.uc_holb_lock); /* HOLB client indexes are reused when a peripheral is
* disconnected and connected back. And so there is no
* need to acquire the lock here as we get the events from
* uC only after a channel is connected atleast once. Also
* if we acquire a lock here we will run into a deadlock
* as we can get uC holb events and a response to add/delete
* commands at the same time.
*/
client_idx = ipa3_get_holb_client_idx_by_ch(gsi_ch); client_idx = ipa3_get_holb_client_idx_by_ch(gsi_ch);
if (client_idx == -EINVAL) { if (client_idx == -EINVAL) {
IPAERR("Invalid client with GSI chan %d\n", gsi_ch); IPAERR("Invalid client with GSI chan %d\n", gsi_ch);
mutex_unlock(&ipa3_ctx->uc_ctx.holb_monitor.uc_holb_lock);
return; return;
} }
holb_client = &(ipa3_ctx->uc_ctx.holb_monitor.client[client_idx]); holb_client = &(ipa3_ctx->uc_ctx.holb_monitor.client[client_idx]);
@ -237,5 +243,4 @@ void ipa3_uc_holb_event_log(uint16_t gsi_ch, bool enable,
holb_client->disable_cnt++; holb_client->disable_cnt++;
holb_client->current_idx = (holb_client->current_idx + 1) % holb_client->current_idx = (holb_client->current_idx + 1) %
IPA_HOLB_EVENT_LOG_MAX; IPA_HOLB_EVENT_LOG_MAX;
mutex_unlock(&ipa3_ctx->uc_ctx.holb_monitor.uc_holb_lock);
} }