msm-core: Improve sampling conditioning

After an investigation it looks like work_busy() is pretty unreliable. So instead we just check whether the appropriate mutex is locked. Also move the sampling conditioning to a seperate method: should_run_resampling() Change-Id: If39b2eecfaa2c32b55e1cf44b0d416a7c21afcc4 Signed-off-by: Alex Naidis <[email protected]> Signed-off-by: Alex Naidis <[email protected]> Signed-off-by: Harsh Shandilya <[email protected]>
msfjarvis · Jan 7, 2018 · 6f8d3ac · 6f8d3ac
1 parent 899057b
commit 6f8d3ac
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/drivers/power/qcom/msm-core.c b/drivers/power/qcom/msm-core.c
@@ -177,11 +177,18 @@ static void set_threshold(struct cpu_activity_info *cpu_node)
 		&cpu_node->low_threshold);
 }
 
+static inline bool should_run_resampling(void)
+{
+	if (!mutex_is_locked(&suspend_update_mutex) && !in_suspend)
+		return true;
+	else
+		return false;
+}
+
 static inline void schedule_sampling(void)
 {
-	if (!work_busy(&sampling_work) && !in_suspend)
+	if (should_run_resampling())
 		queue_work(msm_core_wq, &sampling_work);
-
 }
 
 /* May be called from an interrupt context */
@@ -317,10 +324,10 @@ static inline void do_sampling(void)
 	struct cpu_activity_info *cpu_node;
 	static int prev_temp[NR_CPUS];
 
-	mutex_lock(&suspend_update_mutex);
-	if (in_suspend)
-		goto unlock;
+	if (!should_run_resampling())
+		return;
 
+	mutex_lock(&suspend_update_mutex);
 	trigger_cpu_pwr_stats_calc();
 
 	for_each_online_cpu(cpu) {
@@ -335,7 +342,6 @@ static inline void do_sampling(void)
 				scaling_factor);
 		}
 	}
-unlock:
 		mutex_unlock(&suspend_update_mutex);
 }