Commit 2a8d69f6 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-cpufreq' and 'pm-domains' 

* pm-cpufreq:
  cpufreq: Update MAINTAINERS to include schedutil governor
  cpufreq: Don't find governor for setpolicy drivers in cpufreq_init_policy()
  cpufreq: Explain the kobject_put() in cpufreq_policy_alloc()
  cpufreq: Call transition notifier only once for each policy

* pm-domains:
  soc: imx: gpc: Use GENPD_FLAG_RPM_ALWAYS_ON for ERR009619
  PM / Domains: Add GENPD_FLAG_RPM_ALWAYS_ON flag
parents 9ed09853 32345f45 8d5d766f

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -4073,7 +4073,9 @@ F: Documentation/admin-guide/pm/intel_pstate.rst 
F:	Documentation/cpu-freq/

F:	Documentation/devicetree/bindings/cpufreq/

F:	drivers/cpufreq/

F:	kernel/sched/cpufreq*.c

F:	include/linux/cpufreq.h

F:	include/linux/sched/cpufreq.h

F:	tools/testing/selftests/cpufreq/



CPU FREQUENCY DRIVERS - ARM BIG LITTLE

arch/arm/kernel/smp.c

+15 −9
Original line number Diff line number Diff line
@@ -754,15 +754,20 @@ static int cpufreq_callback(struct notifier_block *nb, 
					unsigned long val, void *data)

{

	struct cpufreq_freqs *freq = data;

	int cpu = freq->cpu;

	struct cpumask *cpus = freq->policy->cpus;

	int cpu, first = cpumask_first(cpus);

	unsigned int lpj;



	if (freq->flags & CPUFREQ_CONST_LOOPS)

		return NOTIFY_OK;



	if (!per_cpu(l_p_j_ref, cpu)) {

	if (!per_cpu(l_p_j_ref, first)) {

		for_each_cpu(cpu, cpus) {

			per_cpu(l_p_j_ref, cpu) =

				per_cpu(cpu_data, cpu).loops_per_jiffy;

			per_cpu(l_p_j_ref_freq, cpu) = freq->old;

		}



		if (!global_l_p_j_ref) {

			global_l_p_j_ref = loops_per_jiffy;

			global_l_p_j_ref_freq = freq->old;
@@ -774,10 +779,11 @@ static int cpufreq_callback(struct notifier_block *nb, 
		loops_per_jiffy = cpufreq_scale(global_l_p_j_ref,

						global_l_p_j_ref_freq,

						freq->new);

		per_cpu(cpu_data, cpu).loops_per_jiffy =

			cpufreq_scale(per_cpu(l_p_j_ref, cpu),

					per_cpu(l_p_j_ref_freq, cpu),

					freq->new);



		lpj = cpufreq_scale(per_cpu(l_p_j_ref, first),

				    per_cpu(l_p_j_ref_freq, first), freq->new);

		for_each_cpu(cpu, cpus)

			per_cpu(cpu_data, cpu).loops_per_jiffy = lpj;

	}

	return NOTIFY_OK;

}

arch/sparc/kernel/time_64.c

+16 −12
Original line number Diff line number Diff line
@@ -653,20 +653,24 @@ static int sparc64_cpufreq_notifier(struct notifier_block *nb, unsigned long val 
				    void *data)

{

	struct cpufreq_freqs *freq = data;

	unsigned int cpu = freq->cpu;

	struct freq_table *ft = &per_cpu(sparc64_freq_table, cpu);

	unsigned int cpu;

	struct freq_table *ft;



	for_each_cpu(cpu, freq->policy->cpus) {

		ft = &per_cpu(sparc64_freq_table, cpu);



		if (!ft->ref_freq) {

			ft->ref_freq = freq->old;

			ft->clock_tick_ref = cpu_data(cpu).clock_tick;

		}



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

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

			cpu_data(cpu).clock_tick =

			cpufreq_scale(ft->clock_tick_ref,

				      ft->ref_freq,

				cpufreq_scale(ft->clock_tick_ref, ft->ref_freq,

					      freq->new);

		}

	}



	return 0;

}

arch/x86/kernel/tsc.c

+1 −1
Original line number Diff line number Diff line
@@ -979,7 +979,7 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, 
		if (!(freq->flags & CPUFREQ_CONST_LOOPS))

			mark_tsc_unstable("cpufreq changes");



		set_cyc2ns_scale(tsc_khz, freq->cpu, rdtsc());

		set_cyc2ns_scale(tsc_khz, freq->policy->cpu, rdtsc());

	}



	return 0;

arch/x86/kvm/x86.c

+20 −11
Original line number Diff line number Diff line
@@ -6698,10 +6698,8 @@ static void kvm_hyperv_tsc_notifier(void) 
}

#endif



static int kvmclock_cpufreq_notifier(struct notifier_block *nb, unsigned long val,

				     void *data)

static void __kvmclock_cpufreq_notifier(struct cpufreq_freqs *freq, int cpu)

{

	struct cpufreq_freqs *freq = data;

	struct kvm *kvm;

	struct kvm_vcpu *vcpu;

	int i, send_ipi = 0;
@@ -6745,17 +6743,12 @@ static int kvmclock_cpufreq_notifier(struct notifier_block *nb, unsigned long va 
	 *

	 */



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

		return 0;

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

		return 0;



	smp_call_function_single(freq->cpu, tsc_khz_changed, freq, 1);

	smp_call_function_single(cpu, tsc_khz_changed, freq, 1);



	spin_lock(&kvm_lock);

	list_for_each_entry(kvm, &vm_list, vm_list) {

		kvm_for_each_vcpu(i, vcpu, kvm) {

			if (vcpu->cpu != freq->cpu)

			if (vcpu->cpu != cpu)

				continue;

			kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu);

			if (vcpu->cpu != smp_processor_id())
@@ -6777,8 +6770,24 @@ static int kvmclock_cpufreq_notifier(struct notifier_block *nb, unsigned long va 
		 * guest context is entered kvmclock will be updated,

		 * so the guest will not see stale values.

		 */

		smp_call_function_single(freq->cpu, tsc_khz_changed, freq, 1);

		smp_call_function_single(cpu, tsc_khz_changed, freq, 1);

	}

}



static int kvmclock_cpufreq_notifier(struct notifier_block *nb, unsigned long val,

				     void *data)

{

	struct cpufreq_freqs *freq = data;

	int cpu;



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

		return 0;

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

		return 0;



	for_each_cpu(cpu, freq->policy->cpus)

		__kvmclock_cpufreq_notifier(freq, cpu);



	return 0;

}