Commit 2bcec09c authored by Mario Limonciello's avatar Mario Limonciello
Browse files

x86/amd: Move amd_get_highest_perf() from amd.c to cppc.c 



To prepare to let amd_get_highest_perf() detect preferred cores
it will require CPPC functions. Move amd_get_highest_perf() to
cppc.c to prepare for 'preferred core detection' rework.

No functional changes intended.

Reviewed-by: default avatarPerry Yuan <perry.yuan@amd.com>
Reviewed-by: default avatarGautham R. Shenoy <gautham.shenoy@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
parent 6b612d1b

arch/x86/kernel/acpi/cppc.c

+16 −0
Original line number Diff line number Diff line
@@ -116,3 +116,19 @@ void init_freq_invariance_cppc(void) 
	init_done = true;

	mutex_unlock(&freq_invariance_lock);

}



u32 amd_get_highest_perf(void)

{

	struct cpuinfo_x86 *c = &boot_cpu_data;



	if (c->x86 == 0x17 && ((c->x86_model >= 0x30 && c->x86_model < 0x40) ||

			       (c->x86_model >= 0x70 && c->x86_model < 0x80)))

		return 166;



	if (c->x86 == 0x19 && ((c->x86_model >= 0x20 && c->x86_model < 0x30) ||

			       (c->x86_model >= 0x40 && c->x86_model < 0x70)))

		return 166;



	return 255;

}

EXPORT_SYMBOL_GPL(amd_get_highest_perf);

arch/x86/kernel/cpu/amd.c

+0 −16
Original line number Diff line number Diff line
@@ -1190,22 +1190,6 @@ unsigned long amd_get_dr_addr_mask(unsigned int dr) 
}

EXPORT_SYMBOL_GPL(amd_get_dr_addr_mask);



u32 amd_get_highest_perf(void)

{

	struct cpuinfo_x86 *c = &boot_cpu_data;



	if (c->x86 == 0x17 && ((c->x86_model >= 0x30 && c->x86_model < 0x40) ||

			       (c->x86_model >= 0x70 && c->x86_model < 0x80)))

		return 166;



	if (c->x86 == 0x19 && ((c->x86_model >= 0x20 && c->x86_model < 0x30) ||

			       (c->x86_model >= 0x40 && c->x86_model < 0x70)))

		return 166;



	return 255;

}

EXPORT_SYMBOL_GPL(amd_get_highest_perf);



static void zenbleed_check_cpu(void *unused)

{

	struct cpuinfo_x86 *c = &cpu_data(smp_processor_id());