Commit 5a2d853f authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq' 

* pm-cpufreq: (30 commits)
  intel_pstate: Set core to min P state during core offline
  cpufreq: Add stop CPU callback to cpufreq_driver interface
  cpufreq: Remove unnecessary braces
  cpufreq: Fix checkpatch errors and warnings
  cpufreq: powerpc: add cpufreq transition latency for FSL e500mc SoCs
  cpufreq: remove unused notifier: CPUFREQ_{SUSPENDCHANGE|RESUMECHANGE}
  cpufreq: Do not allow ->setpolicy drivers to provide ->target
  cpufreq: arm_big_little: set 'physical_cluster' for each CPU
  cpufreq: arm_big_little: make vexpress driver depend on bL core driver
  cpufreq: SPEAr: Instantiate as platform_driver
  cpufreq: Remove unnecessary variable/parameter 'frozen'
  cpufreq: Remove cpufreq_generic_exit()
  cpufreq: add 'freq_table' in struct cpufreq_policy
  cpufreq: Reformat printk() statements
  cpufreq: Tegra: Use cpufreq_generic_suspend()
  cpufreq: s5pv210: Use cpufreq_generic_suspend()
  cpufreq: exynos: Use cpufreq_generic_suspend()
  cpufreq: Implement cpufreq_generic_suspend()
  cpufreq: suspend governors on system suspend/hibernate
  cpufreq: move call to __find_governor() to cpufreq_init_policy()
  ...
parents f71a822f bb18008f

Documentation/cpu-freq/core.txt

+0 −4
Original line number Diff line number Diff line
@@ -92,7 +92,3 @@ values: 
cpu	- number of the affected CPU

old	- old frequency

new	- new frequency
 


If the cpufreq core detects the frequency has changed while the system

was suspended, these notifiers are called with CPUFREQ_RESUMECHANGE as

second argument.

Documentation/cpu-freq/cpu-drivers.txt

+7 −1
Original line number Diff line number Diff line
@@ -61,7 +61,13 @@ target_index - See below on the differences. 


And optionally



cpufreq_driver.exit -		A pointer to a per-CPU cleanup function.

cpufreq_driver.exit -		A pointer to a per-CPU cleanup

				function called during CPU_POST_DEAD

				phase of cpu hotplug process.



cpufreq_driver.stop_cpu -	A pointer to a per-CPU stop function

				called during CPU_DOWN_PREPARE phase of

				cpu hotplug process.



cpufreq_driver.resume -		A pointer to a per-CPU resume function

				which is called with interrupts disabled

arch/arm/kernel/smp.c

+1 −2
Original line number Diff line number Diff line
@@ -674,8 +674,7 @@ static int cpufreq_callback(struct notifier_block *nb, 
	}



	if ((val == CPUFREQ_PRECHANGE  && freq->old < freq->new) ||

	    (val == CPUFREQ_POSTCHANGE && freq->old > freq->new) ||

	    (val == CPUFREQ_RESUMECHANGE || val == CPUFREQ_SUSPENDCHANGE)) {

	    (val == CPUFREQ_POSTCHANGE && freq->old > freq->new)) {

		loops_per_jiffy = cpufreq_scale(global_l_p_j_ref,

						global_l_p_j_ref_freq,

						freq->new);

arch/arm/kernel/smp_twd.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static int twd_cpufreq_transition(struct notifier_block *nb, 
	 * frequency.  The timer is local to a cpu, so cross-call to the

	 * changing cpu.

	 */

	if (state == CPUFREQ_POSTCHANGE || state == CPUFREQ_RESUMECHANGE)

	if (state == CPUFREQ_POSTCHANGE)

		smp_call_function_single(freqs->cpu, twd_update_frequency,

			NULL, 1);

arch/arm/mach-pxa/viper.c

+0 −3
Original line number Diff line number Diff line
@@ -885,9 +885,6 @@ static int viper_cpufreq_notifier(struct notifier_block *nb, 
			viper_set_core_cpu_voltage(freq->new, 0);

		}

		break;

	case CPUFREQ_RESUMECHANGE:

		viper_set_core_cpu_voltage(freq->new, 0);

		break;

	default:

		/* ignore */

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE