commit f3befbd12430906dc82118e80bf8eae34c0a9e19
author Linux Build Service Account <lnxbuild@localhost> Thu Aug 12 00:24:59 2021 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Aug 12 00:24:59 2021 -0700
tree d70b74d276cd4614020f19860a8a0ad9da3f98ee
parent 0bee2e456ce475a0181164e2c18162bd9153755b
parent 2bcad4f4dffaad441f9fa3a4e38b6624f7f77199

Merge "msm: adsprpc: Fix race condition in internal_control"

drivers/char/adsprpc.c

diff --git a/drivers/char/adsprpc.c b/drivers/char/adsprpc.c
index 8fab320..233c3c5 100644
--- a/drivers/char/adsprpc.c
+++ b/drivers/char/adsprpc.c
@@ -408,6 +408,7 @@
 	struct mutex perf_mutex;
 	struct pm_qos_request pm_qos_req;
 	int qos_request;
+	struct mutex pm_qos_mutex;
 	struct mutex map_mutex;
 	struct mutex fl_map_mutex;
 	int refcount;
@@ -3116,6 +3117,7 @@
 	mutex_destroy(&fl->perf_mutex);
 	mutex_destroy(&fl->fl_map_mutex);
 	mutex_destroy(&fl->map_mutex);
+	mutex_destroy(&fl->pm_qos_mutex);
 	kfree(fl);
 	return 0;
 }
@@ -3617,6 +3619,7 @@
 	hlist_add_head(&fl->hn, &me->drivers);
 	spin_unlock(&me->hlock);
 	mutex_init(&fl->perf_mutex);
+	mutex_init(&fl->pm_qos_mutex);
 	return 0;
 }
 
@@ -3719,12 +3722,14 @@
 		VERIFY(err, latency != 0);
 		if (err)
 			goto bail;
+		mutex_lock(&fl->pm_qos_mutex);
 		if (!fl->qos_request) {
 			pm_qos_add_request(&fl->pm_qos_req,
 				PM_QOS_CPU_DMA_LATENCY, latency);
 			fl->qos_request = 1;
 		} else
 			pm_qos_update_request(&fl->pm_qos_req, latency);
+		mutex_unlock(&fl->pm_qos_mutex);
 		break;
 	case FASTRPC_CONTROL_SMMU:
 		if (!me->legacy)