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

Commit 92134bdb authored by Len Brown's avatar Len Brown
Browse files

intel_pstate: use MSR_ATOM_RATIOS definitions from msr-index.h 



Originally, these MSRs were locally defined in this driver.
Now the definitions are in msr-index.h -- use them.

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 8a34fd02

drivers/cpufreq/intel_pstate.c

+5 −10
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ 


#define INTEL_CPUFREQ_TRANSITION_LATENCY	20000



#define ATOM_RATIOS		0x66a

#define ATOM_VIDS		0x66b

#define ATOM_TURBO_RATIOS	0x66c

#define ATOM_TURBO_VIDS		0x66d



#ifdef CONFIG_ACPI

#include <acpi/processor.h>

#include <acpi/cppc_acpi.h>
@@ -1258,7 +1253,7 @@ static int atom_get_min_pstate(void) 
{

	u64 value;



	rdmsrl(ATOM_RATIOS, value);

	rdmsrl(MSR_ATOM_CORE_RATIOS, value);

	return (value >> 8) & 0x7F;

}
@@ -1266,7 +1261,7 @@ static int atom_get_max_pstate(void) 
{

	u64 value;



	rdmsrl(ATOM_RATIOS, value);

	rdmsrl(MSR_ATOM_CORE_RATIOS, value);

	return (value >> 16) & 0x7F;

}
@@ -1274,7 +1269,7 @@ static int atom_get_turbo_pstate(void) 
{

	u64 value;



	rdmsrl(ATOM_TURBO_RATIOS, value);

	rdmsrl(MSR_ATOM_CORE_TURBO_RATIOS, value);

	return value & 0x7F;

}
@@ -1336,7 +1331,7 @@ static void atom_get_vid(struct cpudata *cpudata) 
{

	u64 value;



	rdmsrl(ATOM_VIDS, value);

	rdmsrl(MSR_ATOM_CORE_VIDS, value);

	cpudata->vid.min = int_tofp((value >> 8) & 0x7f);

	cpudata->vid.max = int_tofp((value >> 16) & 0x7f);

	cpudata->vid.ratio = div_fp(
@@ -1344,7 +1339,7 @@ static void atom_get_vid(struct cpudata *cpudata) 
		int_tofp(cpudata->pstate.max_pstate -

			cpudata->pstate.min_pstate));



	rdmsrl(ATOM_TURBO_VIDS, value);

	rdmsrl(MSR_ATOM_CORE_TURBO_VIDS, value);

	cpudata->vid.turbo = value & 0x7f;

}