From 3dc9bda0d5c0dd62f39d31e80fae922ebb875213 Mon Sep 17 00:00:00 2001
From: Wolfgang Müller
Date: Fri, 27 Sep 2024 10:58:30 +0200
Subject: fragments: Extract CPU frequency scaling configuration from cpu
 fragment

There are now two new frequency-related profiles. A legacy "acpi"
profile that activates frequency scaling and the default schedutil
governor, and a newer "amd-pstate" profile that will use the new drivers
for AMD Zen systems.
---
 fragments/cpu/amd             | 1 -
 fragments/cpu/amd-zen3        | 1 -
 fragments/cpu/freq/acpi       | 4 ++++
 fragments/cpu/freq/amd-pstate | 2 ++
 templates/albatross           | 2 +-
 templates/coleridge           | 1 +
 templates/demeter             | 1 +
 7 files changed, 9 insertions(+), 3 deletions(-)
 delete mode 100644 fragments/cpu/amd-zen3
 create mode 100644 fragments/cpu/freq/acpi
 create mode 100644 fragments/cpu/freq/amd-pstate

diff --git a/fragments/cpu/amd b/fragments/cpu/amd
index e773987..89767aa 100644
--- a/fragments/cpu/amd
+++ b/fragments/cpu/amd
@@ -6,7 +6,6 @@ CONFIG_CPU_SUP_AMD=y
 # CONFIG_CPU_SUP_ZHAOXIN is not set
 
 CONFIG_MK8=y
-CONFIG_X86_ACPI_CPUFREQ=y
 CONFIG_X86_AMD_PLATFORM_DEVICE=y
 CONFIG_PERF_EVENTS_AMD_POWER=y
 
diff --git a/fragments/cpu/amd-zen3 b/fragments/cpu/amd-zen3
deleted file mode 100644
index 377cfef..0000000
--- a/fragments/cpu/amd-zen3
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_AMD_PSTATE=y
diff --git a/fragments/cpu/freq/acpi b/fragments/cpu/freq/acpi
new file mode 100644
index 0000000..2c37a12
--- /dev/null
+++ b/fragments/cpu/freq/acpi
@@ -0,0 +1,4 @@
+CONFIG_CPU_FREQ=y
+CONFIG_X86_ACPI_CPUFREQ=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
diff --git a/fragments/cpu/freq/amd-pstate b/fragments/cpu/freq/amd-pstate
new file mode 100644
index 0000000..3c3302e
--- /dev/null
+++ b/fragments/cpu/freq/amd-pstate
@@ -0,0 +1,2 @@
+CONFIG_CPU_FREQ=y
+CONFIG_X86_AMD_PSTATE=y
diff --git a/templates/albatross b/templates/albatross
index 15be341..95e63d2 100644
--- a/templates/albatross
+++ b/templates/albatross
@@ -1,7 +1,7 @@
 boot/efi
 compression/zstd
 cpu/amd
-cpu/amd-zen3
+cpu/freq/amd-pstate
 devices/input/playstation
 devices/input/xpad
 devices/net/igc
diff --git a/templates/coleridge b/templates/coleridge
index d6b7c06..f74c98f 100644
--- a/templates/coleridge
+++ b/templates/coleridge
@@ -1,5 +1,6 @@
 boot/initrd
 cpu/amd
+cpu/freq/acpi
 devices/net/r8169
 drivers/raid
 hosts/coleridge
diff --git a/templates/demeter b/templates/demeter
index 5cd3804..6a8a502 100644
--- a/templates/demeter
+++ b/templates/demeter
@@ -1,5 +1,6 @@
 boot/initrd
 cpu/intel
+cpu/freq/acpi
 devices/net/tigon3
 drivers/raid
 fs/cifs
-- 
cgit v1.2.3-2-gb3c3