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

Commit 8ced6789 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq' 

* pm-cpufreq: (37 commits)
  cpufreq: dt: allow driver to boot automatically
  intel_pstate: Fix overflow in busy_scaled due to long delay
  cpufreq: qoriq: optimize the CPU frequency switching time
  cpufreq: gx-suspmod: Fix two typos in two comments
  cpufreq: nforce2: Fix typo in comment to function nforce2_init()
  cpufreq: governor: Serialize governor callbacks
  cpufreq: governor: split cpufreq_governor_dbs()
  cpufreq: governor: register notifier from cs_init()
  cpufreq: Remove cpufreq_update_policy()
  cpufreq: Restart governor as soon as possible
  cpufreq: Call cpufreq_policy_put_kobj() from cpufreq_policy_free()
  cpufreq: Initialize policy->kobj while allocating policy
  cpufreq: Stop migrating sysfs files on hotplug
  cpufreq: Don't allow updating inactive policies from sysfs
  intel_pstate: Force setting target pstate when required
  intel_pstate: change some inconsistent debug information
  cpufreq: Track cpu managing sysfs kobjects separately
  cpufreq: Fix for typos in two comments
  cpufreq: Mark policy->governor = NULL for inactive policies
  cpufreq: Manage governor usage history with 'policy->last_governor'
  ...
parents 4a3004e5 07949bf9

Documentation/cpu-freq/user-guide.txt

+0 −2
Original line number Diff line number Diff line
@@ -196,8 +196,6 @@ affected_cpus : List of Online CPUs that require software 
related_cpus :			List of Online + Offline CPUs that need software

				coordination of frequency.



scaling_driver :		Hardware driver for cpufreq.



scaling_cur_freq :		Current frequency of the CPU as determined by

				the governor and cpufreq core, in KHz. This is

				the frequency the kernel thinks the CPU runs

drivers/cpufreq/Kconfig.arm

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
# big LITTLE core layer and glue drivers

config ARM_BIG_LITTLE_CPUFREQ

	tristate "Generic ARM big LITTLE CPUfreq driver"

	depends on ARM && BIG_LITTLE && ARM_CPU_TOPOLOGY && HAVE_CLK

	depends on (ARM_CPU_TOPOLOGY || ARM64) && HAVE_CLK

	select PM_OPP

	help

	  This enables the Generic CPUfreq driver for ARM big.LITTLE platforms.

drivers/cpufreq/arm_big_little.c

+32 −8
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/slab.h>

#include <linux/topology.h>

#include <linux/types.h>

#include <asm/bL_switcher.h>



#include "arm_big_little.h"
@@ -41,12 +40,16 @@ 
#define MAX_CLUSTERS	2



#ifdef CONFIG_BL_SWITCHER

#include <asm/bL_switcher.h>

static bool bL_switching_enabled;

#define is_bL_switching_enabled()	bL_switching_enabled

#define set_switching_enabled(x)	(bL_switching_enabled = (x))

#else

#define is_bL_switching_enabled()	false

#define set_switching_enabled(x)	do { } while (0)

#define bL_switch_request(...)		do { } while (0)

#define bL_switcher_put_enabled()	do { } while (0)

#define bL_switcher_get_enabled()	do { } while (0)

#endif



#define ACTUAL_FREQ(cluster, freq)  ((cluster == A7_CLUSTER) ? freq << 1 : freq)
@@ -186,6 +189,15 @@ bL_cpufreq_set_rate(u32 cpu, u32 old_cluster, u32 new_cluster, u32 rate) 
		mutex_unlock(&cluster_lock[old_cluster]);

	}



	/*

	 * FIXME: clk_set_rate has to handle the case where clk_change_rate

	 * can fail due to hardware or firmware issues. Until the clk core

	 * layer is fixed, we can check here. In most of the cases we will

	 * be reading only the cached value anyway. This needs to  be removed

	 * once clk core is fixed.

	 */

	if (bL_cpufreq_get_rate(cpu) != new_rate)

		return -EIO;

	return 0;

}
@@ -322,7 +334,6 @@ static void put_cluster_clk_and_freq_table(struct device *cpu_dev) 
static int _get_cluster_clk_and_freq_table(struct device *cpu_dev)

{

	u32 cluster = raw_cpu_to_cluster(cpu_dev->id);

	char name[14] = "cpu-cluster.";

	int ret;



	if (freq_table[cluster])
@@ -342,8 +353,7 @@ static int _get_cluster_clk_and_freq_table(struct device *cpu_dev) 
		goto free_opp_table;

	}



	name[12] = cluster + '0';

	clk[cluster] = clk_get(cpu_dev, name);

	clk[cluster] = clk_get(cpu_dev, NULL);

	if (!IS_ERR(clk[cluster])) {

		dev_dbg(cpu_dev, "%s: clk: %p & freq table: %p, cluster: %d\n",

				__func__, clk[cluster], freq_table[cluster],
@@ -506,6 +516,7 @@ static struct cpufreq_driver bL_cpufreq_driver = { 
	.attr			= cpufreq_generic_attr,

};



#ifdef CONFIG_BL_SWITCHER

static int bL_cpufreq_switcher_notifier(struct notifier_block *nfb,

					unsigned long action, void *_arg)

{
@@ -538,6 +549,20 @@ static struct notifier_block bL_switcher_notifier = { 
	.notifier_call = bL_cpufreq_switcher_notifier,

};



static int __bLs_register_notifier(void)

{

	return bL_switcher_register_notifier(&bL_switcher_notifier);

}



static int __bLs_unregister_notifier(void)

{

	return bL_switcher_unregister_notifier(&bL_switcher_notifier);

}

#else

static int __bLs_register_notifier(void) { return 0; }

static int __bLs_unregister_notifier(void) { return 0; }

#endif



int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops)

{

	int ret, i;
@@ -555,8 +580,7 @@ int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops) 


	arm_bL_ops = ops;



	ret = bL_switcher_get_enabled();

	set_switching_enabled(ret);

	set_switching_enabled(bL_switcher_get_enabled());



	for (i = 0; i < MAX_CLUSTERS; i++)

		mutex_init(&cluster_lock[i]);
@@ -567,7 +591,7 @@ int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops) 
				__func__, ops->name, ret);

		arm_bL_ops = NULL;

	} else {

		ret = bL_switcher_register_notifier(&bL_switcher_notifier);

		ret = __bLs_register_notifier();

		if (ret) {

			cpufreq_unregister_driver(&bL_cpufreq_driver);

			arm_bL_ops = NULL;
@@ -591,7 +615,7 @@ void bL_cpufreq_unregister(struct cpufreq_arm_bL_ops *ops) 
	}



	bL_switcher_get_enabled();

	bL_switcher_unregister_notifier(&bL_switcher_notifier);

	__bLs_unregister_notifier();

	cpufreq_unregister_driver(&bL_cpufreq_driver);

	bL_switcher_put_enabled();

	pr_info("%s: Un-registered platform driver: %s\n", __func__,

drivers/cpufreq/cpufreq-dt.c

+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ static struct platform_driver dt_cpufreq_platdrv = { 
};

module_platform_driver(dt_cpufreq_platdrv);



MODULE_ALIAS("platform:cpufreq-dt");

MODULE_AUTHOR("Viresh Kumar <viresh.kumar@linaro.org>");

MODULE_AUTHOR("Shawn Guo <shawn.guo@linaro.org>");

MODULE_DESCRIPTION("Generic cpufreq driver");

drivers/cpufreq/cpufreq-nforce2.c

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ static int nforce2_detect_chipset(void) 
 * nforce2_init - initializes the nForce2 CPUFreq driver

 *

 * Initializes the nForce2 FSB support. Returns -ENODEV on unsupported

 * devices, -EINVAL on problems during initiatization, and zero on

 * devices, -EINVAL on problems during initialization, and zero on

 * success.

 */

static int __init nforce2_init(void)