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

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

Merge tag 'pm-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "These fix a few issues in the intel_pstate driver, a documetation
  issue, a false-positive compiler warning in the generic power domains
  framework and two problems in the devfreq subsystem. They also update
  the MAINTAINERS entry for devfreq and add a new "compatible" string to
  the generic cpufreq-dt driver.

  Specifics:

   - Fix a few intel_pstate driver issues: add missing locking it two
     places, avoid exposing a useless debugfs interface and keep the
     attribute values in sysfs in sync (Rafael Wysocki).

   - Drop confusing kernel-doc references related to power management
     and ACPI from the driver API manual (Rafael Wysocki).

   - Make a false-positive compiler warning in the generic power domains
     framework go away (Augusto Mecking Caringi).

   - Fix two initialization issues in the devfreq subsystem and update
     the MAINTAINERS entry for it (Chanwoo Choi).

   - Add a new "compatible" string for APM X-Gene 2 to the generic DT
     cpufreq driver (Hoan Tran)"

* tag 'pm-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: dt: Add support for APM X-Gene 2
  PM / devfreq: exynos-bus: Fix the wrong return value
  PM / devfreq: Fix the bug of devfreq_add_device when governor is NULL
  MAINTAINERS: Add myself as reviewer for DEVFREQ subsystem support
  PM / docs: Drop confusing kernel-doc references from infrastructure.rst
  PM / domains: Fix 'may be used uninitialized' build warning
  cpufreq: intel_pstate: Always keep all limits settings in sync
  cpufreq: intel_pstate: Use locking in intel_cpufreq_verify_policy()
  cpufreq: intel_pstate: Use locking in intel_pstate_resume()
  cpufreq: intel_pstate: Do not expose PID parameters in passive mode
parents 88ba6cae 7e2b9d85

Documentation/driver-api/infrastructure.rst

+0 −15
Original line number Original line Diff line number Diff line
@@ -55,21 +55,6 @@ Device Drivers DMA Management 
.. kernel-doc:: drivers/base/dma-mapping.c

.. kernel-doc:: drivers/base/dma-mapping.c

   :export:

   :export:





Device Drivers Power Management

-------------------------------



.. kernel-doc:: drivers/base/power/main.c

   :export:



Device Drivers ACPI Support

---------------------------



.. kernel-doc:: drivers/acpi/scan.c

   :export:



.. kernel-doc:: drivers/acpi/scan.c

   :internal:



Device drivers PnP support

Device drivers PnP support

--------------------------

--------------------------

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -3800,6 +3800,7 @@ F: include/linux/devcoredump.h 
DEVICE FREQUENCY (DEVFREQ)

DEVICE FREQUENCY (DEVFREQ)

M:	MyungJoo Ham <myungjoo.ham@samsung.com>

M:	MyungJoo Ham <myungjoo.ham@samsung.com>

M:	Kyungmin Park <kyungmin.park@samsung.com>

M:	Kyungmin Park <kyungmin.park@samsung.com>

R:	Chanwoo Choi <cw00.choi@samsung.com>

L:	linux-pm@vger.kernel.org

L:	linux-pm@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git

S:	Maintained

S:	Maintained

drivers/base/power/domain.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -626,6 +626,7 @@ static int genpd_runtime_resume(struct device *dev) 




 out:

 out:

	/* Measure resume latency. */

	/* Measure resume latency. */

	time_start = 0;

	if (timed && runtime_pm)

	if (timed && runtime_pm)

		time_start = ktime_get();

		time_start = ktime_get();

drivers/cpufreq/cpufreq-dt-platdev.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,8 @@ static const struct of_device_id machines[] __initconst = { 
	{ .compatible = "allwinner,sun8i-a83t", },

	{ .compatible = "allwinner,sun8i-a83t", },

	{ .compatible = "allwinner,sun8i-h3", },

	{ .compatible = "allwinner,sun8i-h3", },





	{ .compatible = "apm,xgene-shadowcat", },



	{ .compatible = "arm,integrator-ap", },

	{ .compatible = "arm,integrator-ap", },

	{ .compatible = "arm,integrator-cp", },

	{ .compatible = "arm,integrator-cp", },

drivers/cpufreq/intel_pstate.c

+31 −22
Original line number Original line Diff line number Diff line
@@ -857,13 +857,13 @@ static struct freq_attr *hwp_cpufreq_attrs[] = { 
	NULL,

	NULL,

};

};





static void intel_pstate_hwp_set(const struct cpumask *cpumask)

static void intel_pstate_hwp_set(struct cpufreq_policy *policy)

{

{

	int min, hw_min, max, hw_max, cpu, range, adj_range;

	int min, hw_min, max, hw_max, cpu, range, adj_range;

	struct perf_limits *perf_limits = limits;

	struct perf_limits *perf_limits = limits;

	u64 value, cap;

	u64 value, cap;





	for_each_cpu(cpu, cpumask) {

	for_each_cpu(cpu, policy->cpus) {

		int max_perf_pct, min_perf_pct;

		int max_perf_pct, min_perf_pct;

		struct cpudata *cpu_data = all_cpu_data[cpu];

		struct cpudata *cpu_data = all_cpu_data[cpu];

		s16 epp;

		s16 epp;
@@ -949,7 +949,7 @@ static void intel_pstate_hwp_set(const struct cpumask *cpumask) 
static int intel_pstate_hwp_set_policy(struct cpufreq_policy *policy)

static int intel_pstate_hwp_set_policy(struct cpufreq_policy *policy)

{

{

	if (hwp_active)

	if (hwp_active)

		intel_pstate_hwp_set(policy->cpus);

		intel_pstate_hwp_set(policy);





	return 0;

	return 0;

}

}
@@ -968,19 +968,28 @@ static int intel_pstate_hwp_save_state(struct cpufreq_policy *policy) 




static int intel_pstate_resume(struct cpufreq_policy *policy)

static int intel_pstate_resume(struct cpufreq_policy *policy)

{

{

	int ret;



	if (!hwp_active)

	if (!hwp_active)

		return 0;

		return 0;





	mutex_lock(&intel_pstate_limits_lock);



	all_cpu_data[policy->cpu]->epp_policy = 0;

	all_cpu_data[policy->cpu]->epp_policy = 0;





	return intel_pstate_hwp_set_policy(policy);

	ret = intel_pstate_hwp_set_policy(policy);



	mutex_unlock(&intel_pstate_limits_lock);



	return ret;

}

}





static void intel_pstate_hwp_set_online_cpus(void)

static void intel_pstate_update_policies(void)

{

{

	get_online_cpus();

	int cpu;

	intel_pstate_hwp_set(cpu_online_mask);



	put_online_cpus();

	for_each_possible_cpu(cpu)

		cpufreq_update_policy(cpu);

}

}





/************************** debugfs begin ************************/

/************************** debugfs begin ************************/
@@ -1018,10 +1027,6 @@ static void __init intel_pstate_debug_expose_params(void) 
	struct dentry *debugfs_parent;

	struct dentry *debugfs_parent;

	int i = 0;

	int i = 0;





	if (hwp_active ||

	    pstate_funcs.get_target_pstate == get_target_pstate_use_cpu_load)

		return;



	debugfs_parent = debugfs_create_dir("pstate_snb", NULL);

	debugfs_parent = debugfs_create_dir("pstate_snb", NULL);

	if (IS_ERR_OR_NULL(debugfs_parent))

	if (IS_ERR_OR_NULL(debugfs_parent))

		return;

		return;
@@ -1105,11 +1110,10 @@ static ssize_t store_no_turbo(struct kobject *a, struct attribute *b, 




	limits->no_turbo = clamp_t(int, input, 0, 1);

	limits->no_turbo = clamp_t(int, input, 0, 1);





	if (hwp_active)

		intel_pstate_hwp_set_online_cpus();



	mutex_unlock(&intel_pstate_limits_lock);

	mutex_unlock(&intel_pstate_limits_lock);





	intel_pstate_update_policies();



	return count;

	return count;

}

}
@@ -1134,11 +1138,10 @@ static ssize_t store_max_perf_pct(struct kobject *a, struct attribute *b, 
				   limits->max_perf_pct);

				   limits->max_perf_pct);

	limits->max_perf = div_ext_fp(limits->max_perf_pct, 100);

	limits->max_perf = div_ext_fp(limits->max_perf_pct, 100);





	if (hwp_active)

		intel_pstate_hwp_set_online_cpus();



	mutex_unlock(&intel_pstate_limits_lock);

	mutex_unlock(&intel_pstate_limits_lock);





	intel_pstate_update_policies();



	return count;

	return count;

}

}
@@ -1163,11 +1166,10 @@ static ssize_t store_min_perf_pct(struct kobject *a, struct attribute *b, 
				   limits->min_perf_pct);

				   limits->min_perf_pct);

	limits->min_perf = div_ext_fp(limits->min_perf_pct, 100);

	limits->min_perf = div_ext_fp(limits->min_perf_pct, 100);





	if (hwp_active)

		intel_pstate_hwp_set_online_cpus();



	mutex_unlock(&intel_pstate_limits_lock);

	mutex_unlock(&intel_pstate_limits_lock);





	intel_pstate_update_policies();



	return count;

	return count;

}

}
@@ -2153,8 +2155,12 @@ static int intel_cpufreq_verify_policy(struct cpufreq_policy *policy) 
	if (per_cpu_limits)

	if (per_cpu_limits)

		perf_limits = cpu->perf_limits;

		perf_limits = cpu->perf_limits;





	mutex_lock(&intel_pstate_limits_lock);



	intel_pstate_update_perf_limits(policy, perf_limits);

	intel_pstate_update_perf_limits(policy, perf_limits);





	mutex_unlock(&intel_pstate_limits_lock);



	return 0;

	return 0;

}

}
@@ -2487,7 +2493,10 @@ static int __init intel_pstate_init(void) 
	if (rc)

	if (rc)

		goto out;

		goto out;





	if (intel_pstate_driver == &intel_pstate && !hwp_active &&

	    pstate_funcs.get_target_pstate != get_target_pstate_use_cpu_load)

		intel_pstate_debug_expose_params();

		intel_pstate_debug_expose_params();



	intel_pstate_sysfs_expose_params();

	intel_pstate_sysfs_expose_params();





	if (hwp_active)

	if (hwp_active)