From d355b6fe56e274779d3603e2e28d4b523e06e877 Mon Sep 17 00:00:00 2001 From: Ashok Vuyyuru Date: Thu, 3 Dec 2020 20:32:25 +0530 Subject: [PATCH 1/2] msm: ipa3: Fix to unlock mutex before return Adding changes to unlock mutex before return from QMI send request. Change-Id: I39c32219db69fbc41b30507759bed16acb976005 Signed-off-by: Ashok Vuyyuru --- drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c b/drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c index 51b229a99fd1..c8ef3a0e7bc5 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c @@ -483,8 +483,11 @@ static int ipa3_qmi_send_req_wait(struct qmi_handle *client_handle, req_desc->ei_array, req); - if (unlikely(!ipa_q6_clnt)) + if (unlikely(!ipa_q6_clnt)) { + mutex_unlock(&ipa3_qmi_lock); return -EINVAL; + } + mutex_unlock(&ipa3_qmi_lock); if (ret < 0) { From e74eba42df15e0f657342bef312923a1bbe6d1b8 Mon Sep 17 00:00:00 2001 From: Bojun Pan Date: Mon, 14 Dec 2020 20:22:19 -0800 Subject: [PATCH 2/2] msm: ipa: assert on gsi stop channel failure Add assert on all gsi stop channel cases to capture the issue ahead of time. Change-Id: I044f192c63a724e00a9559bcb44260f0763ff824 Signed-off-by: Bojun Pan --- drivers/platform/msm/ipa/ipa_v3/ipa_utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c b/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c index 109ebb0065ba..a26a2951df2f 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipa_utils.c @@ -8618,6 +8618,7 @@ static int __ipa3_stop_gsi_channel(u32 clnt_hdl) } IPAERR("Failed to stop GSI channel with retries\n"); + ipa_assert(); return res; }