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

Commit a6f6e6e6 authored by Venkatesh Pallipadi's avatar Venkatesh Pallipadi Committed by Dave Jones
Browse files

[CPUFREQ][7/8] acpi-cpufreq: Fix get of current frequency breakage 



Recent speedstep-centrino unification onto acpi-cpufreq patchset broke
cpuinfo_cur_freq interface in /sys/../cpuinfo/, when MSR was used for
transitions. Attached patch fixes that breakage.

Signed-off-by: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent 7650b281

arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c

+4 −1
Original line number Diff line number Diff line
@@ -101,10 +101,13 @@ static unsigned extract_io(u32 value, struct acpi_cpufreq_data *data) 
static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)

{

	int i;

	struct acpi_processor_performance *perf;



	msr &= INTEL_MSR_RANGE;

	perf = data->acpi_data;



	for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {

		if (msr == data->freq_table[i].index)

		if (msr == perf->states[data->freq_table[i].index].status)

			return data->freq_table[i].frequency;

	}

	return data->freq_table[0].frequency;