Skip to contentSkip to conversation

Cpufreq: Remove fossil comment of cpufreq_set_policy

PATCH In review [email protected] 2 participants 5 messages Sep 10, 2013 – Sep 11, 2013 CPU frequency scaling framework

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Cpufreq: Remove fossil comment of cpufreq_set_policy

From: Lan Tianyu <[email protected]>

The cpufreq_set_policy() has been removed by commit 632786c. So remove related comment.

---
 drivers/cpufreq/cpufreq.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/cpufreq/cpufreq.c +0 -4
index 5c75e31..a504313 100644
@@ -506,10 +506,6 @@ static ssize_t store_scaling_governor(struct cpufreq_policy *policy,
 						&new_policy.governor))
 		return -EINVAL;
 
-	/*
-	 * 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;
Signature · 1 line
1.8.2.1
maintainer
#1 lore raw
Quoted 7 lines · On 10 September 2013 20:14, <[email protected]> wrote:

From: Lan Tianyu <[email protected]>

The cpufreq_set_policy() has been removed by commit 632786c. So remove related comment.

---
 drivers/cpufreq/cpufreq.c | 4 ----
 1 file changed, 4 deletions(-)

I have got another patch that takes care of this while fixing other issues.. Yet to be posted though.. but I have queued it up for 3.13..

https://git.linaro.org/gitweb?p=people/vireshk/linux.git;a=commit;h=85267596078e3160b3b03de39d95c8e4b5bdf554

author
#2 lore raw
Quoted 9 lines · Viresh Kumar
Quoted 7 lines · On 10 September 2013 20:14, <[email protected]> wrote:

From: Lan Tianyu <[email protected]>

The cpufreq_set_policy() has been removed by commit 632786c. So remove related comment.

---
 drivers/cpufreq/cpufreq.c | 4 ----
 1 file changed, 4 deletions(-)
Quoted 5 lines

I have got another patch that takes care of this while fixing other issues.. Yet to be posted though.. but I have queued it up for 3.13..

https://git.linaro.org/gitweb?p=people/vireshk/linux.git;a=commit;h=85267596078e3160b3b03de39d95c8e4b5bdf554

Ok. I get it. Please ignore it. I just find another such comment related with cpufreq_set_policy(). Please have a look.

From 668e1b6fd94b5c0e56a651b4c60cbbc7a6868b46 Mon Sep 17 00:00:00 2001
From: Lan Tianyu <[email protected]>
Date: Wed, 11 Sep 2013 11:31:15 +0800
Subject: [PATCH] Cpufreq/governor: Remove fossil comment

cpufreq_set_policy() has been changed to origin __cpufreq_set_policy() and policy->lock has been converted to rewrite lock by commit 5a01f2. So remove it.

---
 drivers/cpufreq/cpufreq_userspace.c | 11 -----------
 1 file changed, 11 deletions(-)
(quoted diff) +0 -0

b/drivers/cpufreq/cpufreq_userspace.c
index 0307809..4dbf1db 100644

drivers/cpufreq/cpufreq_userspace.c +0 -0
@@ -38,18 +38,7 @@ static int cpufreq_set(struct cpufreq_policy *policy,

unsigned int freq)

        if (!per_cpu(cpu_is_managed, policy->cpu))
                goto err;

- /*

-        * We're safe from concurrent calls to ->target() here
-        * as we hold the userspace_mutex lock. If we were calling
-        * cpufreq_driver_target, a deadlock situation might occur:
-        * A: cpufreq_set (lock userspace_mutex) ->
-        *      cpufreq_driver_target(lock policy->lock)
-        * B: cpufreq_set_policy(lock policy->lock) ->
-        *      __cpufreq_governor ->
-        *         cpufreq_governor_userspace (lock userspace_mutex)
-        */
        ret = __cpufreq_driver_target(policy, freq, CPUFREQ_RELATION_L);
-
  err:
        mutex_unlock(&userspace_mutex);
        return ret;

--
1.8.4.rc0.1.g8f6a3e5.dirty

Signature · 2 lines
Best regards
Tianyu Lan
maintainer Acked-by
#3 lore raw
Quoted 38 lines · Lan Tianyu

From 668e1b6fd94b5c0e56a651b4c60cbbc7a6868b46 Mon Sep 17 00:00:00 2001
From: Lan Tianyu <[email protected]>
Date: Wed, 11 Sep 2013 11:31:15 +0800
Subject: [PATCH] Cpufreq/governor: Remove fossil comment

cpufreq_set_policy() has been changed to origin __cpufreq_set_policy() and policy->lock has been converted to rewrite lock by commit 5a01f2. So remove it.

---
 drivers/cpufreq/cpufreq_userspace.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/cpufreq/cpufreq_userspace.c +0 -11
index 0307809..4dbf1db 100644
@@ -38,18 +38,7 @@ static int cpufreq_set(struct cpufreq_policy *policy,
 unsigned int freq)
        if (!per_cpu(cpu_is_managed, policy->cpu))
                goto err;
 
-       /*
-        * We're safe from concurrent calls to ->target() here
-        * as we hold the userspace_mutex lock. If we were calling
-        * cpufreq_driver_target, a deadlock situation might occur:
-        * A: cpufreq_set (lock userspace_mutex) ->
-        *      cpufreq_driver_target(lock policy->lock)
-        * B: cpufreq_set_policy(lock policy->lock) ->
-        *      __cpufreq_governor ->
-        *         cpufreq_governor_userspace (lock userspace_mutex)
-        */
        ret = __cpufreq_driver_target(policy, freq, CPUFREQ_RELATION_L);
-
  err:
        mutex_unlock(&userspace_mutex);
Quoted 1 line
        return ret;

Looks fine:

author
#4 lore raw
Quoted 43 lines · Viresh Kumar
Quoted 38 lines · Lan Tianyu

From 668e1b6fd94b5c0e56a651b4c60cbbc7a6868b46 Mon Sep 17 00:00:00 2001
From: Lan Tianyu <[email protected]>
Date: Wed, 11 Sep 2013 11:31:15 +0800
Subject: [PATCH] Cpufreq/governor: Remove fossil comment

cpufreq_set_policy() has been changed to origin __cpufreq_set_policy() and policy->lock has been converted to rewrite lock by commit 5a01f2. So remove it.

---
  drivers/cpufreq/cpufreq_userspace.c | 11 -----------
  1 file changed, 11 deletions(-)
drivers/cpufreq/cpufreq_userspace.c +0 -11
index 0307809..4dbf1db 100644
@@ -38,18 +38,7 @@ static int cpufreq_set(struct cpufreq_policy *policy,
 unsigned int freq)
         if (!per_cpu(cpu_is_managed, policy->cpu))
                 goto err;
 
-       /*
-        * We're safe from concurrent calls to ->target() here
-        * as we hold the userspace_mutex lock. If we were calling
-        * cpufreq_driver_target, a deadlock situation might occur:
-        * A: cpufreq_set (lock userspace_mutex) ->
-        *      cpufreq_driver_target(lock policy->lock)
-        * B: cpufreq_set_policy(lock policy->lock) ->
-        *      __cpufreq_governor ->
-        *         cpufreq_governor_userspace (lock userspace_mutex)
-        */
         ret = __cpufreq_driver_target(policy, freq, CPUFREQ_RELATION_L);
-
   err:
         mutex_unlock(&userspace_mutex);
Quoted 1 line
         return ret;

Looks fine:

Quoted 2 lines

Thanks. I will send formal version.