Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf821923 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq 

Pull cpufreq updates for 3.4 from Dave Jones: new drivers and some fixes.

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  provide disable_cpufreq() function to disable the API.
  EXYNOS5250: Add support cpufreq for EXYNOS5250
  EXYNOS4X12: Add support cpufreq for EXYNOS4X12
  [CPUFREQ] CPUfreq ondemand: update sampling rate without waiting for next sampling
  [CPUFREQ] Add S3C2416/S3C2450 cpufreq driver
  [CPUFREQ] Fix exposure of ARM_EXYNOS4210_CPUFREQ
  [CPUFREQ] EXYNOS4210: update the name of EXYNOS clock register
  [CPUFREQ] EXYNOS: Initialize locking_frequency with initial frequency
  [CPUFREQ] s3c64xx: Fix mis-cherry pick of VDDINT

Fix up trivial conflicts in Kconfig and Makefile due to just changes
next to each other (OMAP2PLUS changes vs some new EXYNOS cpufreq
drivers).
parents 4416b0ea a7b422cd

arch/arm/mach-exynos/include/mach/cpufreq.h

+2 −0
Original line number Diff line number Diff line
@@ -32,3 +32,5 @@ struct exynos_dvfs_info { 
};



extern int exynos4210_cpufreq_init(struct exynos_dvfs_info *);

extern int exynos4x12_cpufreq_init(struct exynos_dvfs_info *);

extern int exynos5250_cpufreq_init(struct exynos_dvfs_info *);

drivers/cpufreq/Kconfig.arm

+37 −0
Original line number Diff line number Diff line
@@ -7,6 +7,28 @@ config ARM_OMAP2PLUS_CPUFREQ 
	default ARCH_OMAP2PLUS

	select CPU_FREQ_TABLE



config ARM_S3C2416_CPUFREQ

	bool "S3C2416 CPU Frequency scaling support"

	depends on CPU_S3C2416

	help

	  This adds the CPUFreq driver for the Samsung S3C2416 and

	  S3C2450 SoC. The S3C2416 supports changing the rate of the

	  armdiv clock source and also entering a so called dynamic

	  voltage scaling mode in which it is possible to reduce the

	  core voltage of the cpu.



	  If in doubt, say N.



config ARM_S3C2416_CPUFREQ_VCORESCALE

	bool "Allow voltage scaling for S3C2416 arm core (EXPERIMENTAL)"

	depends on ARM_S3C2416_CPUFREQ && REGULATOR && EXPERIMENTAL

	help

	  Enable CPU voltage scaling when entering the dvs mode.

	  It uses information gathered through existing hardware and

	  tests but not documented in any datasheet.



	  If in doubt, say N.



config ARM_S3C64XX_CPUFREQ

	bool "Samsung S3C64XX"

	depends on CPU_S3C6410
@@ -30,6 +52,8 @@ config ARM_EXYNOS_CPUFREQ 
	bool "SAMSUNG EXYNOS SoCs"

	depends on ARCH_EXYNOS

	select ARM_EXYNOS4210_CPUFREQ if CPU_EXYNOS4210

	select ARM_EXYNOS4X12_CPUFREQ if (SOC_EXYNOS4212 || SOC_EXYNOS4412)

	select ARM_EXYNOS5250_CPUFREQ if SOC_EXYNOS5250

	default y

	help

	  This adds the CPUFreq driver common part for Samsung
@@ -39,6 +63,19 @@ config ARM_EXYNOS_CPUFREQ 


config ARM_EXYNOS4210_CPUFREQ

	bool "Samsung EXYNOS4210"

	depends on ARCH_EXYNOS

	help

	  This adds the CPUFreq driver for Samsung EXYNOS4210

	  SoC (S5PV310 or S5PC210).



config ARM_EXYNOS4X12_CPUFREQ

	bool "Samsung EXYNOS4X12"

	help

	  This adds the CPUFreq driver for Samsung EXYNOS4X12

	  SoC (EXYNOS4212 or EXYNOS4412).



config ARM_EXYNOS5250_CPUFREQ

	bool "Samsung EXYNOS5250"

	help

	  This adds the CPUFreq driver for Samsung EXYNOS5250

	  SoC.

drivers/cpufreq/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -40,10 +40,13 @@ obj-$(CONFIG_X86_CPUFREQ_NFORCE2) += cpufreq-nforce2.o 
##################################################################################

# ARM SoC drivers

obj-$(CONFIG_UX500_SOC_DB8500)		+= db8500-cpufreq.o

obj-$(CONFIG_ARM_S3C2416_CPUFREQ)	+= s3c2416-cpufreq.o

obj-$(CONFIG_ARM_S3C64XX_CPUFREQ)	+= s3c64xx-cpufreq.o

obj-$(CONFIG_ARM_S5PV210_CPUFREQ)	+= s5pv210-cpufreq.o

obj-$(CONFIG_ARM_EXYNOS_CPUFREQ)	+= exynos-cpufreq.o

obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ)	+= exynos4210-cpufreq.o

obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ)	+= exynos4x12-cpufreq.o

obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ)	+= exynos5250-cpufreq.o

obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ)     += omap-cpufreq.o



##################################################################################

drivers/cpufreq/cpufreq.c

+24 −0
Original line number Diff line number Diff line
@@ -126,6 +126,15 @@ static int __init init_cpufreq_transition_notifier_list(void) 
}

pure_initcall(init_cpufreq_transition_notifier_list);



static int off __read_mostly;

int cpufreq_disabled(void)

{

	return off;

}

void disable_cpufreq(void)

{

	off = 1;

}

static LIST_HEAD(cpufreq_governor_list);

static DEFINE_MUTEX(cpufreq_governor_mutex);
@@ -1441,6 +1450,9 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, 
{

	int retval = -EINVAL;



	if (cpufreq_disabled())

		return -ENODEV;



	pr_debug("target for CPU %u: %u kHz, relation %u\n", policy->cpu,

		target_freq, relation);

	if (cpu_online(policy->cpu) && cpufreq_driver->target)
@@ -1549,6 +1561,9 @@ int cpufreq_register_governor(struct cpufreq_governor *governor) 
	if (!governor)

		return -EINVAL;



	if (cpufreq_disabled())

		return -ENODEV;



	mutex_lock(&cpufreq_governor_mutex);



	err = -EBUSY;
@@ -1572,6 +1587,9 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor) 
	if (!governor)

		return;



	if (cpufreq_disabled())

		return;



#ifdef CONFIG_HOTPLUG_CPU

	for_each_present_cpu(cpu) {

		if (cpu_online(cpu))
@@ -1814,6 +1832,9 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data) 
	unsigned long flags;

	int ret;



	if (cpufreq_disabled())

		return -ENODEV;



	if (!driver_data || !driver_data->verify || !driver_data->init ||

	    ((!driver_data->setpolicy) && (!driver_data->target)))

		return -EINVAL;
@@ -1901,6 +1922,9 @@ static int __init cpufreq_core_init(void) 
{

	int cpu;



	if (cpufreq_disabled())

		return -ENODEV;



	for_each_possible_cpu(cpu) {

		per_cpu(cpufreq_policy_cpu, cpu) = -1;

		init_rwsem(&per_cpu(cpu_policy_rwsem, cpu));

drivers/cpufreq/cpufreq_ondemand.c

+57 −1
Original line number Diff line number Diff line
@@ -257,6 +257,62 @@ show_one(sampling_down_factor, sampling_down_factor); 
show_one(ignore_nice_load, ignore_nice);

show_one(powersave_bias, powersave_bias);



/**

 * update_sampling_rate - update sampling rate effective immediately if needed.

 * @new_rate: new sampling rate

 *

 * If new rate is smaller than the old, simply updaing

 * dbs_tuners_int.sampling_rate might not be appropriate. For example,

 * if the original sampling_rate was 1 second and the requested new sampling

 * rate is 10 ms because the user needs immediate reaction from ondemand

 * governor, but not sure if higher frequency will be required or not,

 * then, the governor may change the sampling rate too late; up to 1 second

 * later. Thus, if we are reducing the sampling rate, we need to make the

 * new value effective immediately.

 */

static void update_sampling_rate(unsigned int new_rate)

{

	int cpu;



	dbs_tuners_ins.sampling_rate = new_rate

				     = max(new_rate, min_sampling_rate);



	for_each_online_cpu(cpu) {

		struct cpufreq_policy *policy;

		struct cpu_dbs_info_s *dbs_info;

		unsigned long next_sampling, appointed_at;



		policy = cpufreq_cpu_get(cpu);

		if (!policy)

			continue;

		dbs_info = &per_cpu(od_cpu_dbs_info, policy->cpu);

		cpufreq_cpu_put(policy);



		mutex_lock(&dbs_info->timer_mutex);



		if (!delayed_work_pending(&dbs_info->work)) {

			mutex_unlock(&dbs_info->timer_mutex);

			continue;

		}



		next_sampling  = jiffies + usecs_to_jiffies(new_rate);

		appointed_at = dbs_info->work.timer.expires;





		if (time_before(next_sampling, appointed_at)) {



			mutex_unlock(&dbs_info->timer_mutex);

			cancel_delayed_work_sync(&dbs_info->work);

			mutex_lock(&dbs_info->timer_mutex);



			schedule_delayed_work_on(dbs_info->cpu, &dbs_info->work,

						 usecs_to_jiffies(new_rate));



		}

		mutex_unlock(&dbs_info->timer_mutex);

	}

}



static ssize_t store_sampling_rate(struct kobject *a, struct attribute *b,

				   const char *buf, size_t count)

{
@@ -265,7 +321,7 @@ static ssize_t store_sampling_rate(struct kobject *a, struct attribute *b, 
	ret = sscanf(buf, "%u", &input);

	if (ret != 1)

		return -EINVAL;

	dbs_tuners_ins.sampling_rate = max(input, min_sampling_rate);

	update_sampling_rate(input);

	return count;

}