68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
From 29c0347dd542e091e2f7e5980dd885f918f5f676 Mon Sep 17 00:00:00 2001
|
|
From: Mario Limonciello <mario.limonciello@amd.com>
|
|
Date: Thu, 5 Sep 2024 11:29:57 -0500
|
|
Subject: 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: Perry Yuan <perry.yuan@amd.com>
|
|
Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
|
|
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
|
|
Reviewed-by: Gautham R. Shenoy <gautham.sheoy@amd.com>
|
|
---
|
|
arch/x86/kernel/acpi/cppc.c | 16 ++++++++++++++++
|
|
arch/x86/kernel/cpu/amd.c | 16 ----------------
|
|
2 files changed, 16 insertions(+), 16 deletions(-)
|
|
|
|
--- a/arch/x86/kernel/acpi/cppc.c
|
|
+++ b/arch/x86/kernel/acpi/cppc.c
|
|
@@ -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);
|
|
--- a/arch/x86/kernel/cpu/amd.c
|
|
+++ b/arch/x86/kernel/cpu/amd.c
|
|
@@ -1201,22 +1201,6 @@ unsigned long amd_get_dr_addr_mask(unsig
|
|
}
|
|
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());
|