Commit 9b5e9cb1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'pm-sleep' 

* pm-cpuidle:
  intel_idle: stop exposing platform acronyms in sysfs
  cpuidle: menu: Avoid taking spinlock for accessing QoS values

* pm-cpufreq:
  cpufreq: intel_pstate: Fix limits issue with operation mode switching
  cpufreq: qoriq: clean up unused code

* pm-sleep:
  PM / hibernate: Define pr_fmt() and use pr_*() instead of printk()
  PM / hibernate: Untangle power_down()
parents 21ff03c4 de09cdd0 c3a49c89 2872de13

drivers/base/power/qos.c

+1 −2
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ s32 __dev_pm_qos_read_value(struct device *dev) 
{

	lockdep_assert_held(&dev->power.lock);



	return IS_ERR_OR_NULL(dev->power.qos) ?

		0 : pm_qos_read_value(&dev->power.qos->resume_latency);

	return dev_pm_qos_raw_read_value(dev);

}



/**

drivers/cpufreq/intel_pstate.c

+22 −43
Original line number Diff line number Diff line
@@ -364,37 +364,25 @@ static bool driver_registered __read_mostly; 
static bool acpi_ppc;

#endif



static struct perf_limits performance_limits = {

	.no_turbo = 0,

	.turbo_disabled = 0,

	.max_perf_pct = 100,

	.max_perf = int_ext_tofp(1),

	.min_perf_pct = 100,

	.min_perf = int_ext_tofp(1),

	.max_policy_pct = 100,

	.max_sysfs_pct = 100,

	.min_policy_pct = 0,

	.min_sysfs_pct = 0,

};

static struct perf_limits performance_limits;

static struct perf_limits powersave_limits;

static struct perf_limits *limits;



static struct perf_limits powersave_limits = {

	.no_turbo = 0,

	.turbo_disabled = 0,

	.max_perf_pct = 100,

	.max_perf = int_ext_tofp(1),

	.min_perf_pct = 0,

	.min_perf = 0,

	.max_policy_pct = 100,

	.max_sysfs_pct = 100,

	.min_policy_pct = 0,

	.min_sysfs_pct = 0,

};

static void intel_pstate_init_limits(struct perf_limits *limits)

{

	memset(limits, 0, sizeof(*limits));

	limits->max_perf_pct = 100;

	limits->max_perf = int_ext_tofp(1);

	limits->max_policy_pct = 100;

	limits->max_sysfs_pct = 100;

}



#ifdef CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE

static struct perf_limits *limits = &performance_limits;

#else

static struct perf_limits *limits = &powersave_limits;

#endif

static void intel_pstate_set_performance_limits(struct perf_limits *limits)

{

	intel_pstate_init_limits(limits);

	limits->min_perf_pct = 100;

	limits->min_perf = int_ext_tofp(1);

}



static DEFINE_MUTEX(intel_pstate_driver_lock);

static DEFINE_MUTEX(intel_pstate_limits_lock);
@@ -2084,20 +2072,6 @@ static void intel_pstate_clear_update_util_hook(unsigned int cpu) 
	synchronize_sched();

}



static void intel_pstate_set_performance_limits(struct perf_limits *limits)

{

	limits->no_turbo = 0;

	limits->turbo_disabled = 0;

	limits->max_perf_pct = 100;

	limits->max_perf = int_ext_tofp(1);

	limits->min_perf_pct = 100;

	limits->min_perf = int_ext_tofp(1);

	limits->max_policy_pct = 100;

	limits->max_sysfs_pct = 100;

	limits->min_policy_pct = 0;

	limits->min_sysfs_pct = 0;

}



static void intel_pstate_update_perf_limits(struct cpufreq_policy *policy,

					    struct perf_limits *limits)

{
@@ -2466,6 +2440,11 @@ static int intel_pstate_register_driver(void) 
{

	int ret;



	intel_pstate_init_limits(&powersave_limits);

	intel_pstate_set_performance_limits(&performance_limits);

	limits = IS_ENABLED(CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE) ?

			&performance_limits : &powersave_limits;



	ret = cpufreq_register_driver(intel_pstate_driver);

	if (ret) {

		intel_pstate_driver_cleanup();

drivers/cpufreq/qoriq-cpufreq.c

+0 −4
Original line number Diff line number Diff line
@@ -23,10 +23,6 @@ 
#include <linux/slab.h>

#include <linux/smp.h>



#if !defined(CONFIG_ARM)

#include <asm/smp.h>	/* for get_hard_smp_processor_id() in UP configs */

#endif



/**

 * struct cpu_data

 * @pclk: the parent clock of cpu

drivers/cpuidle/governors/menu.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev) 
	unsigned int interactivity_req;

	unsigned int expected_interval;

	unsigned long nr_iowaiters, cpu_load;

	int resume_latency = dev_pm_qos_read_value(device);

	int resume_latency = dev_pm_qos_raw_read_value(device);



	if (data->needs_update) {

		menu_update(drv, dev);

drivers/idle/intel_idle.c

+86 −86

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE