From bda1c552e9acc4f6e1da44504343abb189590bb9 Mon Sep 17 00:00:00 2001
From: Angel Pons <th3fanbus@gmail.com>
Date: Thu, 29 Oct 2020 00:08:24 +0100
Subject: [PATCH] cpu/intel/haswell/acpi.c: Use C-state enum definitions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tested with BUILD_TIMELESS=1, Asrock B85M Pro4 does not change.

Change-Id: I0ca98cbe45e10d233607f68923f08752fdda9698
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46923
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/cpu/intel/haswell/acpi.c         | 12 ++++++------
 src/cpu/intel/haswell/haswell.h      | 21 +++++++++++++++++++++
 src/cpu/intel/haswell/haswell_init.c | 21 ---------------------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/cpu/intel/haswell/acpi.c b/src/cpu/intel/haswell/acpi.c
index d257d8682a..7c99df36c0 100644
--- a/src/cpu/intel/haswell/acpi.c
+++ b/src/cpu/intel/haswell/acpi.c
@@ -15,15 +15,15 @@
 #include <southbridge/intel/lynxpoint/pch.h>
 
 static int cstate_set_lp[3] = {
-	2,
-	3,
-	9,
+	C_STATE_C1E,
+	C_STATE_C3,
+	C_STATE_C7S_LONG_LAT,
 };
 
 static int cstate_set_trad[3] = {
-	1,
-	3,
-	5,
+	C_STATE_C1,
+	C_STATE_C3,
+	C_STATE_C6_LONG_LAT,
 };
 
 static int get_cores_per_package(void)
diff --git a/src/cpu/intel/haswell/haswell.h b/src/cpu/intel/haswell/haswell.h
index 284ff013a3..5084cd3bef 100644
--- a/src/cpu/intel/haswell/haswell.h
+++ b/src/cpu/intel/haswell/haswell.h
@@ -125,6 +125,27 @@
 # error "CONFIG_IED_REGION_SIZE is not a power of 2"
 #endif
 
+/*
+ * List of supported C-states for Haswell and Broadwell.
+ * Only the ULT parts support C8, C9, and C10.
+ */
+enum {
+	C_STATE_C0		=  0,
+	C_STATE_C1		=  1,
+	C_STATE_C1E		=  2,
+	C_STATE_C3		=  3,
+	C_STATE_C6_SHORT_LAT	=  4,
+	C_STATE_C6_LONG_LAT	=  5,
+	C_STATE_C7_SHORT_LAT	=  6,
+	C_STATE_C7_LONG_LAT	=  7,
+	C_STATE_C7S_SHORT_LAT	=  8,
+	C_STATE_C7S_LONG_LAT	=  9,
+	C_STATE_C8		= 10,
+	C_STATE_C9		= 11,
+	C_STATE_C10		= 12,
+	NUM_C_STATES,
+};
+
 /* Lock MSRs */
 void intel_cpu_haswell_finalize_smm(void);
 
diff --git a/src/cpu/intel/haswell/haswell_init.c b/src/cpu/intel/haswell/haswell_init.c
index dd1970c033..fa2f3f631c 100644
--- a/src/cpu/intel/haswell/haswell_init.c
+++ b/src/cpu/intel/haswell/haswell_init.c
@@ -20,27 +20,6 @@
 #include "haswell.h"
 #include "chip.h"
 
-/*
- * List of supported C-states in this processor. Only the ULT parts support C8,
- * C9, and C10.
- */
-enum {
-	C_STATE_C0,             /* 0 */
-	C_STATE_C1,             /* 1 */
-	C_STATE_C1E,            /* 2 */
-	C_STATE_C3,             /* 3 */
-	C_STATE_C6_SHORT_LAT,   /* 4 */
-	C_STATE_C6_LONG_LAT,    /* 5 */
-	C_STATE_C7_SHORT_LAT,   /* 6 */
-	C_STATE_C7_LONG_LAT,    /* 7 */
-	C_STATE_C7S_SHORT_LAT,  /* 8 */
-	C_STATE_C7S_LONG_LAT,   /* 9 */
-	C_STATE_C8,             /* 10 */
-	C_STATE_C9,             /* 11 */
-	C_STATE_C10,            /* 12 */
-	NUM_C_STATES
-};
-
 #define MWAIT_RES(state, sub_state)                         \
 	{                                                   \
 		.addrl = (((state) << 4) | (sub_state)),    \