Attachment 76340 Details for Bug 119836

[patch] Fix max_freq override when changing governor

cpufreq_sysfs_max_override.patch (text/plain), 2.19 KB, created by Thomas Renninger on 2006-04-04 08:56:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Renninger

Created: 2006-04-04 08:56:27 UTC

Size: 2.19 KB

patch

obsolete

>From: Thomas Renninger <trenn@suse.de>
>Subject: Max freq stucks at low freq if reduced by _PPC and sysfs gov access
>Patch-mainline: not yet
>References: 119836
>
>The problem is reproducable by(if machine is limiting freqs via BIOS):
> - Unplugging AC -> max freq gets limited
> - echo ${governor} >/sys/.../cpufreq/scaling_governor (policy->user_data.max
>   gets overridden with policy->max and will never come up again.)
>
>This patch exchanged the cpufreq_set_policy call to __cpufreq_set_policy and
>duplicated it's functionality but did not override user_data.max.
>
> drivers/cpufreq/cpufreq.c |   29 ++++++++++++++++++++++-------
> 1 files changed, 22 insertions(+), 7 deletions(-)
>
>Signed-off-by: Thomas Renninger <trenn@suse.de>
>
>Index: linux-2.6.16/drivers/cpufreq/cpufreq.c
>===================================================================
>--- linux-2.6.16.orig/drivers/cpufreq/cpufreq.c
>+++ linux-2.6.16/drivers/cpufreq/cpufreq.c
>@@ -402,7 +402,7 @@ static ssize_t show_scaling_governor (st
> 	return -EINVAL;
> }
> 
>-
>+static int __cpufreq_set_policy(struct cpufreq_policy *data, struct cpufreq_policy *policy);
> /**
>  * store_scaling_governor - store policy for the specified CPU
>  */
>@@ -413,19 +413,34 @@ static ssize_t store_scaling_governor (s
> 	char	str_governor[16];
> 	struct cpufreq_policy new_policy;
> 
>+	mutex_lock(&policy->lock);
> 	ret = cpufreq_get_policy(&new_policy, policy->cpu);
> 	if (ret)
>-		return ret;
>+		goto error;
> 
> 	ret = sscanf (buf, "%15s", str_governor);
>-	if (ret != 1)
>-		return -EINVAL;
>+	if (ret != 1){
>+		ret =  -EINVAL;
>+		goto error;
>+	}
> 
>-	if (cpufreq_parse_governor(str_governor, &new_policy.policy, &new_policy.governor))
>-		return -EINVAL;
>+	if (cpufreq_parse_governor(str_governor, &new_policy.policy, &new_policy.governor)){
>+		ret =  -EINVAL;
>+		goto error;
>+	}
>+	/* Do not use cpufreq_set_policy here or the user_policy.max
>+	   will be wrongly overridden */
>+	ret = __cpufreq_set_policy(policy, &new_policy);
>+
>+	policy->user_policy.policy = policy->policy;
>+	policy->user_policy.governor = policy->governor;
>+	mutex_unlock(&policy->lock);
>+	cpufreq_cpu_put(policy);
> 
>-	ret = cpufreq_set_policy(&new_policy);
> 	return ret ? ret : count;
>+ error:
>+	mutex_unlock(&policy->lock);
>+	return ret;
> }
> 
> /**

Actions: View | Diff

Attachments on bug 119836: 51313 | 51314 | 64821 | 64823 | 76338 | 76340