shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

cpufreq: fix denied access to cpufreq_target after resume

Browse Source
This commit is contained in:
陈亮
2014-04-03 23:28:49 -07:00
parent 287dbefa77
commit 80c3557f9b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/cpufreq/rockchip-cpufreq.c
View File

@@ -63,7 +63,7 @@ static struct cpufreq_frequency_table *freq_table = default_freq_table;
#define MASK_FURTHER_CPUFREQ 0x30
/* With 0x00(NOCHANGE), it depends on the previous "further" status */
#define CPUFREQ_PRIVATE 0x100
static int no_cpufreq_access;
static unsigned int no_cpufreq_access = 0;
static unsigned int suspend_freq = 816 * 1000;
static unsigned int suspend_volt = 1000000; // 1V
static unsigned int low_battery_freq = 600 * 1000;
@@ -309,7 +309,7 @@ static int cpufreq_target(struct cpufreq_policy *policy, unsigned int target_fre
is_private = relation & CPUFREQ_PRIVATE;
relation &= ~CPUFREQ_PRIVATE;
if (relation & ENABLE_FURTHER_CPUFREQ)
if ((relation & ENABLE_FURTHER_CPUFREQ) && no_cpufreq_access)
no_cpufreq_access--;
if (no_cpufreq_access) {
FREQ_LOG("denied access to %s as it is disabled temporarily\n", __func__);
@@ -365,6 +365,10 @@ static int cpufreq_pm_notifier_event(struct notifier_block *this, unsigned long
break;
case PM_POST_RESTORE:
case PM_POST_SUSPEND:
//if (target_freq == policy->cur) then cpufreq_driver_target
//will return, and our target will not be called, it casue
//ENABLE_FURTHER_CPUFREQ flag invalid, avoid that.
policy->cur++;
cpufreq_driver_target(policy, suspend_freq, ENABLE_FURTHER_CPUFREQ | CPUFREQ_RELATION_H);
ret = NOTIFY_OK;
break;