summaryrefslogtreecommitdiff
path: root/src/include/cpu
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2012-11-07 12:27:29 -0600
committerRonald G. Minnich <rminnich@gmail.com>2013-02-27 03:03:50 +0100
commit62f100b02888c2de21d61caf5d850f1184e8be1a (patch)
tree06b6cd5dcaa191699ce6455274891d9b7d58caf0 /src/include/cpu
parentda3087f67d516350249779745927861c4da2173d (diff)
downloadcoreboot-62f100b02888c2de21d61caf5d850f1184e8be1a.tar.xz
smm: Update rev 0x30101 SMM revision save state
According to both Haswell and the SandyBridge/Ivybridge BWGs the save state area actually starts at 0x7c00 offset from 0x8000. Update the em64t101_smm_state_save_area_t structure and introduce a define for the offset. Note: I have no idea what eptp is. It's just listed in the haswell BWG. The offsets should not be changed. Change-Id: I38d1d1469e30628a83f10b188ab2fe53d5a50e5a Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/2515 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/include/cpu')
-rw-r--r--src/include/cpu/x86/smm.h37
1 files changed, 25 insertions, 12 deletions
diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h
index b52a315017..3ffebf4255 100644
--- a/src/include/cpu/x86/smm.h
+++ b/src/include/cpu/x86/smm.h
@@ -27,6 +27,9 @@
/* used only by C programs so far */
#define SMM_BASE 0xa0000
+#define SMM_ENTRY_OFFSET 0x8000
+#define SMM_SAVE_STATE_BEGIN(x) (SMM_ENTRY_OFFSET + (x))
+
#include <types.h>
typedef struct {
u16 es_selector;
@@ -202,11 +205,17 @@ typedef struct {
/* Intel Revision 30101 SMM State-Save Area
- * Used in SandyBridge/IvyBridge architecture
- * starts @ 0x7d00
+ * The following processor architectures use this:
+ * - SandyBridge
+ * - IvyBridge
+ * - Haswell
*/
+#define SMM_EM64T101_ARCH_OFFSET 0x7c00
+#define SMM_EM64T101_SAVE_STATE_OFFSET \
+ SMM_SAVE_STATE_BEGIN(SMM_EM64T101_ARCH_OFFSET)
typedef struct {
- u8 reserved0[208];
+ u8 reserved0[256];
+ u8 reserved1[208];
u32 gdtr_upper_base;
u32 ldtr_upper_base;
@@ -219,25 +228,29 @@ typedef struct {
u64 io_rcx;
u64 io_rsi;
- u8 reserved1[52];
+ u8 reserved2[52];
u32 shutdown_auto_restart;
- u8 reserved2[8];
+ u8 reserved3[8];
u32 cr4;
- u8 reserved3[72];
+ u8 reserved4[72];
u32 gdtr_base;
- u8 reserved4[4];
- u32 idtr_base;
u8 reserved5[4];
+ u32 idtr_base;
+ u8 reserved6[4];
u32 ldtr_base;
- u8 reserved6[68];
+ u8 reserved7[56];
+ /* EPTP fields are only on Haswell according to BWGs, but Intel was
+ * wise and reused the same revision number. */
+ u64 eptp;
+ u32 eptp_en;
u32 cs_base;
- u8 reserved7[4];
+ u8 reserved8[4];
u32 iedbase;
- u8 reserved8[8];
+ u8 reserved9[8];
u32 smbase;
u32 smm_revision;
@@ -245,7 +258,7 @@ typedef struct {
u16 io_restart;
u16 autohalt_restart;
- u8 reserved9[24];
+ u8 reserved10[24];
u64 r15;
u64 r14;