summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cpu/intel/model_2065x/acpi.c7
-rw-r--r--src/cpu/intel/model_206ax/acpi.c7
-rw-r--r--src/cpu/intel/model_206ax/acpi/cpu.asl77
-rw-r--r--src/ec/lenovo/h8/acpi/thermal.asl7
-rw-r--r--src/mainboard/gigabyte/ga-b75m-d3h/acpi/thermal.asl2
-rw-r--r--src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl2
-rw-r--r--src/mainboard/gigabyte/ga-h61m-s2pv/acpi/thermal.asl2
-rw-r--r--src/mainboard/google/butterfly/acpi/thermal.asl2
-rw-r--r--src/mainboard/google/link/acpi/thermal.asl2
-rw-r--r--src/mainboard/google/parrot/acpi/thermal.asl2
-rw-r--r--src/mainboard/google/stout/acpi/thermal.asl2
-rw-r--r--src/mainboard/intel/emeraldlake2/acpi/thermal.asl2
-rw-r--r--src/mainboard/kontron/ktqm77/acpi/thermal.asl2
-rw-r--r--src/mainboard/roda/rv11/acpi/thermal.asl2
-rw-r--r--src/mainboard/samsung/lumpy/acpi/thermal.asl2
-rw-r--r--src/mainboard/samsung/stumpy/acpi/thermal.asl2
16 files changed, 48 insertions, 74 deletions
diff --git a/src/cpu/intel/model_2065x/acpi.c b/src/cpu/intel/model_2065x/acpi.c
index 7de8b19a7d..514ea44ecb 100644
--- a/src/cpu/intel/model_2065x/acpi.c
+++ b/src/cpu/intel/model_2065x/acpi.c
@@ -331,6 +331,13 @@ void generate_cpu_entries(struct device *device)
acpigen_pop_len();
}
}
+
+ /* PPKG is usually used for thermal management
+ of the first and only package. */
+ acpigen_write_processor_package("PPKG", 0, cores_per_package);
+
+ /* Add a method to notify processor nodes */
+ acpigen_write_processor_cnot(cores_per_package);
}
struct chip_operations cpu_intel_model_2065x_ops = {
diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c
index 8e2c0d17f6..aca2277fa6 100644
--- a/src/cpu/intel/model_206ax/acpi.c
+++ b/src/cpu/intel/model_206ax/acpi.c
@@ -334,6 +334,13 @@ void generate_cpu_entries(struct device *device)
acpigen_pop_len();
}
}
+
+ /* PPKG is usually used for thermal management
+ of the first and only package. */
+ acpigen_write_processor_package("PPKG", 0, cores_per_package);
+
+ /* Add a method to notify processor nodes */
+ acpigen_write_processor_cnot(cores_per_package);
}
struct chip_operations cpu_intel_model_206ax_ops = {
diff --git a/src/cpu/intel/model_206ax/acpi/cpu.asl b/src/cpu/intel/model_206ax/acpi/cpu.asl
index a95c54a71c..6fad17f74e 100644
--- a/src/cpu/intel/model_206ax/acpi/cpu.asl
+++ b/src/cpu/intel/model_206ax/acpi/cpu.asl
@@ -14,84 +14,23 @@
* GNU General Public License for more details.
*/
-/* These devices are created at runtime */
-External (\_PR.CP00, DeviceObj)
-External (\_PR.CP01, DeviceObj)
-External (\_PR.CP02, DeviceObj)
-External (\_PR.CP03, DeviceObj)
-External (\_PR.CP04, DeviceObj)
-External (\_PR.CP05, DeviceObj)
-External (\_PR.CP06, DeviceObj)
-External (\_PR.CP07, DeviceObj)
+/* These come from the dynamically created CPU SSDT */
+External (\_PR.CNOT, MethodObj)
-/* Notify OS to re-read CPU tables, assuming ^2 CPU count */
+/* Notify OS to re-read CPU tables */
Method (PNOT)
{
- If (LGreaterEqual (\PCNT, 2)) {
- Notify (\_PR.CP00, 0x81) // _CST
- Notify (\_PR.CP01, 0x81) // _CST
- }
- If (LGreaterEqual (\PCNT, 4)) {
- Notify (\_PR.CP02, 0x81) // _CST
- Notify (\_PR.CP03, 0x81) // _CST
- }
- If (LGreaterEqual (\PCNT, 8)) {
- Notify (\_PR.CP04, 0x81) // _CST
- Notify (\_PR.CP05, 0x81) // _CST
- Notify (\_PR.CP06, 0x81) // _CST
- Notify (\_PR.CP07, 0x81) // _CST
- }
+ \_PR.CNOT (0x81)
}
-/* Notify OS to re-read CPU _PPC limit, assuming ^2 CPU count */
+/* Notify OS to re-read CPU _PPC limit */
Method (PPCN)
{
- If (LGreaterEqual (\PCNT, 2)) {
- Notify (\_PR.CP00, 0x80) // _PPC
- Notify (\_PR.CP01, 0x80) // _PPC
- }
- If (LGreaterEqual (\PCNT, 4)) {
- Notify (\_PR.CP02, 0x80) // _PPC
- Notify (\_PR.CP03, 0x80) // _PPC
- }
- If (LGreaterEqual (\PCNT, 8)) {
- Notify (\_PR.CP04, 0x80) // _PPC
- Notify (\_PR.CP05, 0x80) // _PPC
- Notify (\_PR.CP06, 0x80) // _PPC
- Notify (\_PR.CP07, 0x80) // _PPC
- }
+ \_PR.CNOT (0x80)
}
-/* Notify OS to re-read Throttle Limit tables, assuming ^2 CPU count */
+/* Notify OS to re-read Throttle Limit tables */
Method (TNOT)
{
- If (LGreaterEqual (\PCNT, 2)) {
- Notify (\_PR.CP00, 0x82) // _TPC
- Notify (\_PR.CP01, 0x82) // _TPC
- }
- If (LGreaterEqual (\PCNT, 4)) {
- Notify (\_PR.CP02, 0x82) // _TPC
- Notify (\_PR.CP03, 0x82) // _TPC
- }
- If (LGreaterEqual (\PCNT, 8)) {
- Notify (\_PR.CP04, 0x82) // _TPC
- Notify (\_PR.CP05, 0x82) // _TPC
- Notify (\_PR.CP06, 0x82) // _TPC
- Notify (\_PR.CP07, 0x82) // _TPC
- }
-}
-
-/* Return a package containing enabled processor entries */
-Method (PPKG)
-{
- If (LGreaterEqual (\PCNT, 8)) {
- Return (Package() {\_PR.CP00, \_PR.CP01, \_PR.CP02, \_PR.CP03,
- \_PR.CP04, \_PR.CP05, \_PR.CP06, \_PR.CP07})
- } ElseIf (LGreaterEqual (\PCNT, 4)) {
- Return (Package() {\_PR.CP00, \_PR.CP01, \_PR.CP02, \_PR.CP03})
- } ElseIf (LGreaterEqual (\PCNT, 2)) {
- Return (Package() {\_PR.CP00, \_PR.CP01})
- } Else {
- Return (Package() {\_PR.CP00})
- }
+ \_PR.CNOT (0x82)
}
diff --git a/src/ec/lenovo/h8/acpi/thermal.asl b/src/ec/lenovo/h8/acpi/thermal.asl
index 86fc31158c..5ca7a5ab9c 100644
--- a/src/ec/lenovo/h8/acpi/thermal.asl
+++ b/src/ec/lenovo/h8/acpi/thermal.asl
@@ -46,12 +46,9 @@ Scope(\_TZ)
Name (_TC1, 0x02)
Name (_TC2, 0x05)
-#if !IS_ENABLED(CONFIG_CPU_INTEL_MODEL_206AX) && \
- !IS_ENABLED(CONFIG_CPU_INTEL_MODEL_2065X) && \
- !IS_ENABLED(CONFIG_CPU_INTEL_MODEL_306AX)
- /* Generated by acpigen */
+/* Generated by acpigen */
External (\PPKG, MethodObj)
-#endif
+
/* Processors used for passive cooling */
Method (_PSL, 0, Serialized)
{
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/thermal.asl b/src/mainboard/gigabyte/ga-b75m-d3h/acpi/thermal.asl
index c2bc80c84f..ca561a5039 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/thermal.asl
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/acpi/thermal.asl
@@ -15,6 +15,8 @@
// Thermal Zone
+External (\PPKG, MethodObj)
+
Scope (\_TZ)
{
ThermalZone (THRM)
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl b/src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl
index c2bc80c84f..ca561a5039 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl
@@ -15,6 +15,8 @@
// Thermal Zone
+External (\PPKG, MethodObj)
+
Scope (\_TZ)
{
ThermalZone (THRM)
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/acpi/thermal.asl b/src/mainboard/gigabyte/ga-h61m-s2pv/acpi/thermal.asl
index c2bc80c84f..ca561a5039 100644
--- a/src/mainboard/gigabyte/ga-h61m-s2pv/acpi/thermal.asl
+++ b/src/mainboard/gigabyte/ga-h61m-s2pv/acpi/thermal.asl
@@ -15,6 +15,8 @@
// Thermal Zone
+External (\PPKG, MethodObj)
+
Scope (\_TZ)
{
ThermalZone (THRM)
diff --git a/src/mainboard/google/butterfly/acpi/thermal.asl b/src/mainboard/google/butterfly/acpi/thermal.asl
index 2faa7de636..8268799c75 100644
--- a/src/mainboard/google/butterfly/acpi/thermal.asl
+++ b/src/mainboard/google/butterfly/acpi/thermal.asl
@@ -15,6 +15,8 @@
// Thermal Zone
+External (\PPKG, MethodObj)
+
#define HAVE_THERMALZONE
Scope (\_TZ)
{
diff --git a/src/mainboard/google/link/acpi/thermal.asl b/src/mainboard/google/link/acpi/thermal.asl
index e0d25e711d..d1b3255010 100644
--- a/src/mainboard/google/link/acpi/thermal.asl
+++ b/src/mainboard/google/link/acpi/thermal.asl
@@ -15,6 +15,8 @@
// Thermal Zone
+External (\PPKG, MethodObj)
+
#define HAVE_THERMALZONE
Scope (\_TZ)
{
diff --git a/src/mainboard/google/parrot/acpi/thermal.asl b/src/mainboard/google/parrot/acpi/thermal.asl
index 38fe15f77d..728280e463 100644
--- a/src/mainboard/google/parrot/acpi/thermal.asl
+++ b/src/mainboard/google/parrot/acpi/thermal.asl
@@ -15,6 +15,8 @@
// Thermal Zone
+External (\PPKG, MethodObj)
+
#define HAVE_THERMALZONE
Scope (\_TZ)
{
diff --git a/src/mainboard/google/stout/acpi/thermal.asl b/src/mainboard/google/stout/acpi/thermal.asl
index 335f018ecd..0cda0783be 100644
--- a/src/mainboard/google/stout/acpi/thermal.asl
+++ b/src/mainboard/google/stout/acpi/thermal.asl
@@ -15,6 +15,8 @@
// Thermal Zone
+External (\PPKG, MethodObj)
+
#define HAVE_THERMALZONE
Scope (\_TZ)
{
diff --git a/src/mainboard/intel/emeraldlake2/acpi/thermal.asl b/src/mainboard/intel/emeraldlake2/acpi/thermal.asl
index b3d3824eb6..c3ec240ecf 100644
--- a/src/mainboard/intel/emeraldlake2/acpi/thermal.asl
+++ b/src/mainboard/intel/emeraldlake2/acpi/thermal.asl
@@ -15,6 +15,8 @@
// Thermal Zone
+External (\PPKG, MethodObj)
+
#define HAVE_THERMALZONE
Scope (\_TZ)
{
diff --git a/src/mainboard/kontron/ktqm77/acpi/thermal.asl b/src/mainboard/kontron/ktqm77/acpi/thermal.asl
index 9c1407ea90..3d01b6d2e8 100644
--- a/src/mainboard/kontron/ktqm77/acpi/thermal.asl
+++ b/src/mainboard/kontron/ktqm77/acpi/thermal.asl
@@ -16,6 +16,8 @@
// Thermal Zone
+External (\PPKG, MethodObj)
+
#define HAVE_THERMALZONE
Scope (\_TZ)
{
diff --git a/src/mainboard/roda/rv11/acpi/thermal.asl b/src/mainboard/roda/rv11/acpi/thermal.asl
index a1d28e4c53..f18ee292fb 100644
--- a/src/mainboard/roda/rv11/acpi/thermal.asl
+++ b/src/mainboard/roda/rv11/acpi/thermal.asl
@@ -15,6 +15,8 @@
// Thermal Zone
+External (\PPKG, MethodObj)
+
#define HAVE_THERMALZONE
Scope (\_TZ)
{
diff --git a/src/mainboard/samsung/lumpy/acpi/thermal.asl b/src/mainboard/samsung/lumpy/acpi/thermal.asl
index 10a74f3bb0..330d9af656 100644
--- a/src/mainboard/samsung/lumpy/acpi/thermal.asl
+++ b/src/mainboard/samsung/lumpy/acpi/thermal.asl
@@ -15,6 +15,8 @@
// Thermal Zone
+External (\PPKG, MethodObj)
+
#define HAVE_THERMALZONE
Scope (\_TZ)
{
diff --git a/src/mainboard/samsung/stumpy/acpi/thermal.asl b/src/mainboard/samsung/stumpy/acpi/thermal.asl
index 448cb97392..9987257508 100644
--- a/src/mainboard/samsung/stumpy/acpi/thermal.asl
+++ b/src/mainboard/samsung/stumpy/acpi/thermal.asl
@@ -15,6 +15,8 @@
// Thermal Zone
+External (\PPKG, MethodObj)
+
Scope (\_TZ)
{
ThermalZone (THRM)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 00:06:11 +0000