Commit 7005f6dc authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq' 

* pm-cpufreq: (24 commits)
  cpufreq: st: add missing \n to end of dev_err message
  cpufreq: kirkwood: add missing \n to end of dev_err messages
  cpufreq: CPPC: Avoid overflow when calculating desired_perf
  cpufreq: ti: Use generic platdev driver
  cpufreq: intel_pstate: Add io_boost trace
  cpufreq: intel_pstate: Use IOWAIT flag in Atom algorithm
  cpufreq: schedutil: Add iowait boosting
  cpufreq / sched: SCHED_CPUFREQ_IOWAIT flag to indicate iowait condition
  cpufreq: CPPC: Force reporting values in KHz to fix user space interface
  cpufreq: create link to policy only for registered CPUs
  intel_pstate: constify local structures
  cpufreq: dt: Support governor tunables per policy
  cpufreq: dt: Update kconfig description
  cpufreq: dt: Remove unused code
  MAINTAINERS: Add Documentation/cpu-freq/
  cpufreq: dt: Add support for r8a7792
  cpufreq / sched: ignore SMT when determining max cpu capacity
  cpufreq: Drop unnecessary check from cpufreq_policy_alloc()
  ARM: multi_v7_defconfig: Don't attempt to enable schedutil governor as module
  ARM: exynos_defconfig: Don't attempt to enable schedutil governor as module
  ...
parents 2dc3c72c b6e25117

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3282,6 +3282,7 @@ L: linux-pm@vger.kernel.org 
S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git

T:	git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)

F:	Documentation/cpu-freq/

F:	drivers/cpufreq/

F:	include/linux/cpufreq.h

arch/arm/configs/exynos_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 
CONFIG_CPU_FREQ_GOV_POWERSAVE=m

CONFIG_CPU_FREQ_GOV_USERSPACE=m

CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m

CONFIG_CPU_FREQ_GOV_SCHEDUTIL=m

CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y

CONFIG_CPUFREQ_DT=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_EXYNOS_CPUIDLE=y

arch/arm/configs/multi_v7_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 
CONFIG_CPU_FREQ_GOV_POWERSAVE=m

CONFIG_CPU_FREQ_GOV_USERSPACE=m

CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m

CONFIG_CPU_FREQ_GOV_SCHEDUTIL=m

CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y

CONFIG_QORIQ_CPUFREQ=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_CPUIDLE=y

drivers/cpufreq/Kconfig

+2 −5
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ config CPU_FREQ_GOV_CONSERVATIVE 
	  If in doubt, say N.



config CPU_FREQ_GOV_SCHEDUTIL

	tristate "'schedutil' cpufreq policy governor"

	bool "'schedutil' cpufreq policy governor"

	depends on CPU_FREQ && SMP

	select CPU_FREQ_GOV_ATTR_SET

	select IRQ_WORK
@@ -208,9 +208,6 @@ config CPU_FREQ_GOV_SCHEDUTIL 
	  frequency tipping point is at utilization/capacity equal to 80% in

	  both cases.



	  To compile this driver as a module, choose M here: the module will

	  be called cpufreq_schedutil.



	  If in doubt, say N.



comment "CPU frequency scaling drivers"
@@ -225,7 +222,7 @@ config CPUFREQ_DT 
	help

	  This adds a generic DT based cpufreq driver for frequency management.

	  It supports both uniprocessor (UP) and symmetric multiprocessor (SMP)

	  systems which share clock and voltage across all CPUs.

	  systems.



	  If in doubt, say N.

drivers/cpufreq/cppc_cpufreq.c

+49 −4
Original line number Diff line number Diff line
@@ -19,10 +19,19 @@ 
#include <linux/delay.h>

#include <linux/cpu.h>

#include <linux/cpufreq.h>

#include <linux/dmi.h>

#include <linux/vmalloc.h>



#include <asm/unaligned.h>



#include <acpi/cppc_acpi.h>



/* Minimum struct length needed for the DMI processor entry we want */

#define DMI_ENTRY_PROCESSOR_MIN_LENGTH	48



/* Offest in the DMI processor structure for the max frequency */

#define DMI_PROCESSOR_MAX_SPEED  0x14



/*

 * These structs contain information parsed from per CPU

 * ACPI _CPC structures.
@@ -32,6 +41,39 @@ 
 */

static struct cpudata **all_cpu_data;



/* Capture the max KHz from DMI */

static u64 cppc_dmi_max_khz;



/* Callback function used to retrieve the max frequency from DMI */

static void cppc_find_dmi_mhz(const struct dmi_header *dm, void *private)

{

	const u8 *dmi_data = (const u8 *)dm;

	u16 *mhz = (u16 *)private;



	if (dm->type == DMI_ENTRY_PROCESSOR &&

	    dm->length >= DMI_ENTRY_PROCESSOR_MIN_LENGTH) {

		u16 val = (u16)get_unaligned((const u16 *)

				(dmi_data + DMI_PROCESSOR_MAX_SPEED));

		*mhz = val > *mhz ? val : *mhz;

	}

}



/* Look up the max frequency in DMI */

static u64 cppc_get_dmi_max_khz(void)

{

	u16 mhz = 0;



	dmi_walk(cppc_find_dmi_mhz, &mhz);



	/*

	 * Real stupid fallback value, just in case there is no

	 * actual value set.

	 */

	mhz = mhz ? mhz : 1;



	return (1000 * mhz);

}



static int cppc_cpufreq_set_target(struct cpufreq_policy *policy,

		unsigned int target_freq,

		unsigned int relation)
@@ -42,7 +84,7 @@ static int cppc_cpufreq_set_target(struct cpufreq_policy *policy, 


	cpu = all_cpu_data[policy->cpu];



	cpu->perf_ctrls.desired_perf = target_freq;

	cpu->perf_ctrls.desired_perf = (u64)target_freq * policy->max / cppc_dmi_max_khz;

	freqs.old = policy->cur;

	freqs.new = target_freq;
@@ -94,8 +136,10 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy) 
		return ret;

	}



	policy->min = cpu->perf_caps.lowest_perf;

	policy->max = cpu->perf_caps.highest_perf;

	cppc_dmi_max_khz = cppc_get_dmi_max_khz();



	policy->min = cpu->perf_caps.lowest_perf * cppc_dmi_max_khz / cpu->perf_caps.highest_perf;

	policy->max = cppc_dmi_max_khz;

	policy->cpuinfo.min_freq = policy->min;

	policy->cpuinfo.max_freq = policy->max;

	policy->shared_type = cpu->shared_type;
@@ -112,7 +156,8 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	cpu->cur_policy = policy;



	/* Set policy->cur to max now. The governors will adjust later. */

	policy->cur = cpu->perf_ctrls.desired_perf = cpu->perf_caps.highest_perf;

	policy->cur = cppc_dmi_max_khz;

	cpu->perf_ctrls.desired_perf = cpu->perf_caps.highest_perf;



	ret = cppc_set_perf(cpu_num, &cpu->perf_ctrls);

	if (ret)

CRA Git | Maintained and supported by SUSTech CRA and CCSE