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

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

Merge changes Ic8c20ca7,I998008ef,Ica95fd83,I74201fa1 into msm-4.14 

* changes:
  drivers: cpuidle: lpm-levels: Ignore sleep bias for isolated cpus
  cpuidle: lpm-levels: Do not predict LPM for isolated cpus
  cpuidle: lpm-levels: Correctly check if its okay to do cluster LPM
  drivers: cpuidle: lpm-levels: Remove unused code
parents bfe62607 5a38caa6

drivers/cpuidle/lpm-levels.c

+5 −7
Original line number Diff line number Diff line
@@ -121,9 +121,6 @@ static void cluster_prepare(struct lpm_cluster *cluster, 
		const struct cpumask *cpu, int child_idx, bool from_idle,

		int64_t time);



static bool menu_select;

module_param_named(menu_select, menu_select, bool, 0664);



static int msm_pm_sleep_time_override;

module_param_named(sleep_time_override,

	msm_pm_sleep_time_override, int, 0664);
@@ -611,10 +608,8 @@ static int cpu_power_select(struct cpuidle_device *dev, 


	next_event_us = (uint32_t)(ktime_to_us(get_next_event_time(dev->cpu)));



	if (is_cpu_biased(dev->cpu)) {

		best_level = 0;

	if (is_cpu_biased(dev->cpu) && (!cpu_isolated(dev->cpu)))

		goto done_select;

	}



	for (i = 0; i < cpu->nlevels; i++) {

		struct lpm_cpu_level *level = &cpu->levels[i];
@@ -640,7 +635,7 @@ static int cpu_power_select(struct cpuidle_device *dev, 
				next_wakeup_us = next_event_us - lvl_latency_us;

		}



		if (!i) {

		if (!i && !cpu_isolated(dev->cpu)) {

			/*

			 * If the next_wake_us itself is not sufficient for

			 * deeper low power modes than clock gating do not
@@ -977,6 +972,9 @@ static int cluster_select(struct lpm_cluster *cluster, bool from_idle, 
		if (suspend_in_progress && from_idle && level->notify_rpm)

			continue;



		if (level->notify_rpm && !system_sleep_allowed())

			continue;



		best_level = i;



		if (from_idle &&

drivers/cpuidle/lpm-levels.h

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ struct lpm_cpu_level { 
	struct power_params pwr;

	unsigned int psci_id;

	bool is_reset;

	bool hyp_psci;

	int reset_level;

};

include/trace/events/trace_msm_low_power.h

+1 −19
Original line number Diff line number Diff line 
/* Copyright (c) 2012, 2014-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012, 2014-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -250,24 +250,6 @@ TRACE_EVENT(cluster_pred_hist, 
		__entry->sample, __entry->tmr)

);



TRACE_EVENT(pre_pc_cb,



	TP_PROTO(int tzflag),



	TP_ARGS(tzflag),



	TP_STRUCT__entry(

		__field(int, tzflag)

	),



	TP_fast_assign(

		__entry->tzflag = tzflag;

	),



	TP_printk("tzflag:%d",

		__entry->tzflag

	)

);

#endif

#define TRACE_INCLUDE_FILE trace_msm_low_power

#include <trace/define_trace.h>