a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers: thermal: fix upstream conflicts/issues

Browse Source
This commit is contained in:
FAROVITUS 2018-08-17 12:45:45 +02:00 committed by BlackMesa123
parent e0fefa3cff
commit e3f6f1f3f6
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/thermal/cpu_cooling.c
View File

@ -85,6 +85,8 @@ static LIST_HEAD(cpufreq_dev_list);
static BLOCKING_NOTIFIER_HEAD(cpu_notifier);
static enum tmu_noti_state_t cpu_tstate = TMU_NORMAL;
/**
* get_idr - function to get a unique id.
* @idr: struct idr * handle used to create a id.
@ -160,13 +162,17 @@ static unsigned long get_level(struct cpufreq_cooling_device *cpufreq_dev,
unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq)
{
struct cpufreq_cooling_device *cpufreq_dev;
unsigned long level = 0;
mutex_lock(&cooling_list_lock);
list_for_each_entry(cpufreq_dev, &cpufreq_dev_list, node) {
if (cpumask_test_cpu(cpu, &cpufreq_dev->allowed_cpus)) {
unsigned long level = get_level(cpufreq_dev, freq);
mutex_unlock(&cooling_list_lock);
level = get_level(cpufreq_dev, freq);
if (level == THERMAL_CSTATE_INVALID && freq > cpufreq_dev->freq_table[0])
level = 0;
return level;
}
}
@ -874,6 +880,30 @@ static int cpufreq_power2state(struct thermal_cooling_device *cdev,
return 0;
}
static int cpufreq_set_cur_temp(struct thermal_cooling_device *cdev,
bool suspended, int temp)
{
enum tmu_noti_state_t tstate;
unsigned int on;
if (suspended || temp < EXYNOS_COLD_TEMP) {
tstate = TMU_COLD;
on = 1;
} else {
tstate = TMU_NORMAL;
on = 0;
}
if (cpu_tstate == tstate)
return 0;
cpu_tstate = tstate;
blocking_notifier_call_chain(&cpu_notifier, TMU_COLD, &on);
return 0;
}
/* Bind cpufreq callbacks to thermal cooling device ops */
static struct thermal_cooling_device_ops cpufreq_cooling_ops = {
.get_max_state = cpufreq_get_max_state,
@ -1015,6 +1045,9 @@ __cpufreq_cooling_register(struct device_node *np,
pr_debug("%s: freq:%u KHz\n", __func__, freq);
}
if (cpufreq_dev->id == 0)
cpufreq_cooling_ops.set_cur_temp = cpufreq_set_cur_temp;
snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",
cpufreq_dev->id);