Commit 242aa883 authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: Remove 'policy->governor_enabled' 



The entire sequence of events (like INIT/START or STOP/EXIT) for which
cpufreq_governor() is called, is guaranteed to be protected by
policy->rwsem now.

The additional checks that were added earlier (as we were forced to drop
policy->rwsem before calling cpufreq_governor() for EXIT event), aren't
required anymore.

Over that, they weren't sufficient really. They just take care of
START/STOP events, but not INIT/EXIT and the state machine was never
maintained properly by them.

Kill the unnecessary checks and policy->governor_enabled field.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent a1317e09

drivers/cpufreq/cpufreq.c

+0 −17
Original line number Original line Diff line number Diff line
@@ -2010,17 +2010,6 @@ static int cpufreq_governor(struct cpufreq_policy *policy, unsigned int event) 




	pr_debug("%s: for CPU %u, event %u\n", __func__, policy->cpu, event);

	pr_debug("%s: for CPU %u, event %u\n", __func__, policy->cpu, event);





	if ((policy->governor_enabled && event == CPUFREQ_GOV_START)

	    || (!policy->governor_enabled

	    && (event == CPUFREQ_GOV_LIMITS || event == CPUFREQ_GOV_STOP))) {

		return -EBUSY;

	}



	if (event == CPUFREQ_GOV_STOP)

		policy->governor_enabled = false;

	else if (event == CPUFREQ_GOV_START)

		policy->governor_enabled = true;



	ret = policy->governor->governor(policy, event);

	ret = policy->governor->governor(policy, event);





	if (!ret) {

	if (!ret) {
@@ -2028,12 +2017,6 @@ static int cpufreq_governor(struct cpufreq_policy *policy, unsigned int event) 
			policy->governor->initialized++;

			policy->governor->initialized++;

		else if (event == CPUFREQ_GOV_POLICY_EXIT)

		else if (event == CPUFREQ_GOV_POLICY_EXIT)

			policy->governor->initialized--;

			policy->governor->initialized--;

	} else {

		/* Restore original values */

		if (event == CPUFREQ_GOV_STOP)

			policy->governor_enabled = true;

		else if (event == CPUFREQ_GOV_START)

			policy->governor_enabled = false;

	}

	}





	if (((event == CPUFREQ_GOV_POLICY_INIT) && ret) ||

	if (((event == CPUFREQ_GOV_POLICY_INIT) && ret) ||

include/linux/cpufreq.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,6 @@ struct cpufreq_policy { 
	unsigned int		last_policy; /* policy before unplug */

	unsigned int		last_policy; /* policy before unplug */

	struct cpufreq_governor	*governor; /* see below */

	struct cpufreq_governor	*governor; /* see below */

	void			*governor_data;

	void			*governor_data;

	bool			governor_enabled; /* governor start/stop flag */

	char			last_governor[CPUFREQ_NAME_LEN]; /* last governor used */

	char			last_governor[CPUFREQ_NAME_LEN]; /* last governor used */





	struct work_struct	update; /* if update_policy() needs to be

	struct work_struct	update; /* if update_policy() needs to be

CRA Git | Maintained and supported by SUSTech CRA and CCSE