Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 746e27f4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "lpm-levels: Fix cpu idle trace and stats event"

parents c8ac2180 019526d1

drivers/cpuidle/lpm-levels.c

+6 −3
Original line number Diff line number Diff line
@@ -1003,6 +1003,9 @@ static int lpm_cpuidle_enter(struct cpuidle_device *dev, 
	int64_t start_time = ktime_to_ns(ktime_get()), end_time;

	struct power_params *pwr_params;



	if (idx < 0)

		return -EINVAL;



	pwr_params = &cluster->cpu->levels[idx].pwr;

	sched_set_cpu_cstate(smp_processor_id(), idx + 1,

		pwr_params->energy_overhead, pwr_params->latency_us);
@@ -1010,12 +1013,12 @@ static int lpm_cpuidle_enter(struct cpuidle_device *dev, 
	cpu_prepare(cluster, idx, true);

	cluster_prepare(cluster, cpumask, idx, true, ktime_to_ns(ktime_get()));



	if (need_resched() || (idx < 0))

		goto exit;



	trace_cpu_idle_enter(idx);

	lpm_stats_cpu_enter(idx, start_time);



	if (need_resched())

		goto exit;



	if (!use_psci) {

		if (idx > 0)

			update_debug_pc_event(CPU_ENTER, idx, 0xdeaffeed,