[coreboot-gerrit] Patch set updated for coreboot: arch/x86: provide common Intel ACPI hardware definitions

[Aaron Durbin (adurbin@chromium.org)]

Aaron Durbin (adurbin at chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15666

-gerrit

commit 853619b895da2668789fb22c7738a875d068f3e8
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Wed Jul 13 23:13:25 2016 -0500

    arch/x86: provide common Intel ACPI hardware definitions
    
    In the ACPI specification the PM1 register locations are well
    defined, but the sleep type values are hardware specific. That
    said, the Intel chipsets have been consistent with the values
    they use. Therefore, provide those hardware definitions as well
    a helper function for translating the hardware values to the
    more high level ACPI sleep values.
    
    BUG=chrome-os-partner:54977
    
    Change-Id: Iaeda082e362de5d440256d05e6885b3388ffbe43
    Signed-off-by: Aaron Durbin <adurbin at chromium.org>
---
 src/acpi/Kconfig                 |  6 ++++++
 src/arch/x86/include/arch/acpi.h | 34 ++++++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/acpi/Kconfig b/src/acpi/Kconfig
index e025f99..447927b 100644
--- a/src/acpi/Kconfig
+++ b/src/acpi/Kconfig
@@ -4,3 +4,9 @@ config ACPI_SATA_GENERATOR
 	default n
 	help
 	  Use acpi sata port generator.
+
+config ACPI_INTEL_HARDWARE_SLEEP_VALUES
+	def_bool n
+	help
+	  Provide common definitions for Intel hardware PM1_CNT regiser sleep
+	  values.
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 03cd709..71bf622 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -31,7 +31,22 @@
 #define HIGH_MEMORY_SAVE	0
 #endif
 
-#ifndef __ASSEMBLER__
+#if IS_ENABLED(CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES)
+/*
+ * The type and enable fields are common in ACPI, but the
+ * values themselves are hardware implementation idefiend.
+ */
+#define SLP_EN		(1 << 13)
+#define SLP_TYP_SHIFT	10
+#define SLP_TYP		(7 << SLP_TYP_SHIFT)
+#define  SLP_TYP_S0	0
+#define  SLP_TYP_S1	1
+#define  SLP_TYP_S3	5
+#define  SLP_TYP_S4	6
+#define  SLP_TYP_S5	7
+#endif
+
+#if !defined(__ASSEMBLER__) && !defined(__ACPI__)
 #include <stdint.h>
 #include <rules.h>
 #include <commonlib/helpers.h>
@@ -624,6 +639,21 @@ enum {
 	ACPI_S5,
 };
 
+#if IS_ENABLED(CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES)
+/* Provided the PM1 control register return the ACPI sleep type. */
+static inline int acpi_sleep_from_pm1(uint32_t pm1_cnt)
+{
+	switch (((pm1_cnt) & SLP_TYP) >> SLP_TYP_SHIFT) {
+	case SLP_TYP_S0: return ACPI_S0;
+	case SLP_TYP_S1: return ACPI_S1;
+	case SLP_TYP_S3: return ACPI_S3;
+	case SLP_TYP_S4: return ACPI_S4;
+	case SLP_TYP_S5: return ACPI_S5;
+	}
+	return -1;
+}
+#endif
+
 /* Returns ACPI_Sx values. */
 int acpi_get_sleep_type(void);
 
@@ -660,6 +690,6 @@ static inline uintptr_t acpi_align_current(uintptr_t current)
 	return ALIGN(current, 16);
 }
 
-#endif  /* __ASSEMBLER__ */
+#endif  /* !defined(__ASSEMBLER__) && !defined(__ACPI__) */
 
 #endif  /* __ASM_ACPI_H */