cpu/intel/sandybridge: Use enum for ACPI C states
Also remove the now unnecessary comments from the devicetree.
Change-Id: Iebbe12fd413b7a2eb1078a579e194eba821ada7c
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69292
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
diff --git a/src/cpu/intel/model_206ax/chip.h b/src/cpu/intel/model_206ax/chip.h
index 4fff04a..a46c7bf 100644
--- a/src/cpu/intel/model_206ax/chip.h
+++ b/src/cpu/intel/model_206ax/chip.h
@@ -3,10 +3,21 @@
/* Magic value used to locate this chip in the device tree */
#define SPEEDSTEP_APIC_MAGIC 0xACAC
+/* Keep this in sync with acpi.c */
+enum cpu_acpi_level {
+ CPU_ACPI_DISABLED = 0,
+ CPU_ACPI_C1,
+ CPU_ACPI_C2,
+ CPU_ACPI_C3,
+ CPU_ACPI_C6,
+ CPU_ACPI_C7,
+ CPU_ACPI_C7S,
+};
+
struct cpu_intel_model_206ax_config {
- int acpi_c1; /* ACPI C1 */
- int acpi_c2; /* ACPI C2 */
- int acpi_c3; /* ACPI C3 */
+ enum cpu_acpi_level acpi_c1;
+ enum cpu_acpi_level acpi_c2;
+ enum cpu_acpi_level acpi_c3;
int tcc_offset; /* TCC Activation Offset */
};
diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb
index 9255848..fef8992 100644
--- a/src/mainboard/intel/emeraldlake2/devicetree.cb
+++ b/src/mainboard/intel/emeraldlake2/devicetree.cb
@@ -17,8 +17,8 @@
device lapic 0 on end
device lapic 0xacac off end
- register "acpi_c1" = "3" # ACPI(C1) = MWAIT(C3)
- register "acpi_c2" = "4" # ACPI(C2) = MWAIT(C6)
+ register "acpi_c1" = "CPU_ACPI_C3"
+ register "acpi_c2" = "CPU_ACPI_C6"
end
end
diff --git a/src/mainboard/kontron/ktqm77/devicetree.cb b/src/mainboard/kontron/ktqm77/devicetree.cb
index 1bbbbfc..a72b94f 100644
--- a/src/mainboard/kontron/ktqm77/devicetree.cb
+++ b/src/mainboard/kontron/ktqm77/devicetree.cb
@@ -8,8 +8,8 @@
device lapic 0 on end
device lapic 0xacac off end
- register "acpi_c2" = "4" # ACPI(C2) = MWAIT(C3)
- register "acpi_c3" = "0" # ACPI(C3) = MWAIT(C7)
+ register "acpi_c2" = "CPU_ACPI_C6"
+ register "acpi_c3" = "CPU_ACPI_DISABLED"
end
end
diff --git a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
index 7cb6812..2e5ee0f 100644
--- a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
+++ b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb
@@ -23,8 +23,8 @@
device lapic 0 on end
device lapic 0xacac off end
- register "acpi_c2" = "4" # ACPI(C2) = MWAIT(C6)
- register "acpi_c3" = "0"
+ register "acpi_c2" = "CPU_ACPI_C6"
+ register "acpi_c3" = "CPU_ACPI_DISABLED"
end
end
diff --git a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
index 96a8ce8..20b1c9a 100644
--- a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
+++ b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb
@@ -23,8 +23,8 @@
device lapic 0 on end
device lapic 0xacac off end
- register "acpi_c2" = "4" # ACPI(C2) = MWAIT(C6)
- register "acpi_c3" = "0"
+ register "acpi_c2" = "CPU_ACPI_C6"
+ register "acpi_c3" = "CPU_ACPI_DISABLED"
end
end
diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb
index ea164c4..cd7b907 100644
--- a/src/mainboard/samsung/stumpy/devicetree.cb
+++ b/src/mainboard/samsung/stumpy/devicetree.cb
@@ -17,8 +17,8 @@
device lapic 0 on end
device lapic 0xacac off end
- register "acpi_c1" = "3" # ACPI(C1) = MWAIT(C3)
- register "acpi_c2" = "4" # ACPI(C2) = MWAIT(C6)
+ register "acpi_c1" = "CPU_ACPI_C3"
+ register "acpi_c2" = "CPU_ACPI_C6"
end
end
diff --git a/src/northbridge/intel/sandybridge/chipset.cb b/src/northbridge/intel/sandybridge/chipset.cb
index e7ade19..16fab6d 100644
--- a/src/northbridge/intel/sandybridge/chipset.cb
+++ b/src/northbridge/intel/sandybridge/chipset.cb
@@ -8,9 +8,9 @@
device lapic 0 on end
device lapic 0xacac off end
- register "acpi_c1" = "1" # ACPI(C1) = MWAIT(C1)
- register "acpi_c2" = "3" # ACPI(C2) = MWAIT(C3)
- register "acpi_c3" = "5" # ACPI(C3) = MWAIT(C7)
+ register "acpi_c1" = "CPU_ACPI_C1"
+ register "acpi_c2" = "CPU_ACPI_C3"
+ register "acpi_c3" = "CPU_ACPI_C7"
end
end