mirror of
https://github.com/fail0verflow/switch-linux.git
synced 2025-05-04 02:34:21 -04:00
Merge branch 'pm-devfreq'
* pm-devfreq: PM / devfreq: Rewrite devfreq_update_status() to fix multiple bugs
This commit is contained in:
commit
0ecfe310f4
1 changed files with 20 additions and 11 deletions
|
@ -91,26 +91,35 @@ static int devfreq_get_freq_level(struct devfreq *devfreq, unsigned long freq)
|
||||||
*/
|
*/
|
||||||
static int devfreq_update_status(struct devfreq *devfreq, unsigned long freq)
|
static int devfreq_update_status(struct devfreq *devfreq, unsigned long freq)
|
||||||
{
|
{
|
||||||
int lev, prev_lev;
|
int lev, prev_lev, ret = 0;
|
||||||
unsigned long cur_time;
|
unsigned long cur_time;
|
||||||
|
|
||||||
lev = devfreq_get_freq_level(devfreq, freq);
|
|
||||||
if (lev < 0)
|
|
||||||
return lev;
|
|
||||||
|
|
||||||
cur_time = jiffies;
|
cur_time = jiffies;
|
||||||
devfreq->time_in_state[lev] +=
|
|
||||||
|
prev_lev = devfreq_get_freq_level(devfreq, devfreq->previous_freq);
|
||||||
|
if (prev_lev < 0) {
|
||||||
|
ret = prev_lev;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
devfreq->time_in_state[prev_lev] +=
|
||||||
cur_time - devfreq->last_stat_updated;
|
cur_time - devfreq->last_stat_updated;
|
||||||
if (freq != devfreq->previous_freq) {
|
|
||||||
prev_lev = devfreq_get_freq_level(devfreq,
|
lev = devfreq_get_freq_level(devfreq, freq);
|
||||||
devfreq->previous_freq);
|
if (lev < 0) {
|
||||||
|
ret = lev;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (lev != prev_lev) {
|
||||||
devfreq->trans_table[(prev_lev *
|
devfreq->trans_table[(prev_lev *
|
||||||
devfreq->profile->max_state) + lev]++;
|
devfreq->profile->max_state) + lev]++;
|
||||||
devfreq->total_trans++;
|
devfreq->total_trans++;
|
||||||
}
|
}
|
||||||
devfreq->last_stat_updated = cur_time;
|
|
||||||
|
|
||||||
return 0;
|
out:
|
||||||
|
devfreq->last_stat_updated = cur_time;
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Reference in a new issue