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

Commit 179ee434 authored by Matthew Garrett's avatar Matthew Garrett Committed by Dave Jones
Browse files

[CPUFREQ] Fix PCC driver error path 



The PCC cpufreq driver unmaps the mailbox address range if any CPUs fail to
initialise, but doesn't do anything to remove the registered CPUs from the
cpufreq core resulting in failures further down the line. We're better off
simply returning a failure - the cpufreq core will unregister us cleanly if
we end up with no successfully registered CPUs. Tidy up the failure path
and also add a sanity check to ensure that the firmware gives us a realistic
frequency - the core deals badly with that being set to 0.

Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
Cc: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent 3847d223

arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c

+9 −8
Original line number Diff line number Diff line
@@ -541,13 +541,13 @@ static int pcc_cpufreq_cpu_init(struct cpufreq_policy *policy) 


	if (!pcch_virt_addr) {

		result = -1;

		goto pcch_null;

		goto out;

	}



	result = pcc_get_offset(cpu);

	if (result) {

		dprintk("init: PCCP evaluation failed\n");

		goto free;

		goto out;

	}



	policy->max = policy->cpuinfo.max_freq =
@@ -556,14 +556,15 @@ static int pcc_cpufreq_cpu_init(struct cpufreq_policy *policy) 
		ioread32(&pcch_hdr->minimum_frequency) * 1000;

	policy->cur = pcc_get_freq(cpu);



	if (!policy->cur) {

		dprintk("init: Unable to get current CPU frequency\n");

		result = -EINVAL;

		goto out;

	}



	dprintk("init: policy->max is %d, policy->min is %d\n",

		policy->max, policy->min);



	return 0;

free:

	pcc_clear_mapping();

	free_percpu(pcc_cpu_info);

pcch_null:

out:

	return result;

}