summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-14 04:22:09 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-15 06:58:45 +0000
commit2c430c8c5b75f9d8b99c0f9358eea3470aa4f7ed (patch)
tree4c12ce4e8111f016a76f118f480d2cb9bdf79b5a /src
parentfaf20d30a6e451d45e29613e3f4603dc72771843 (diff)
downloadcoreboot-2c430c8c5b75f9d8b99c0f9358eea3470aa4f7ed.tar.xz
intel/smm: Define struct ied_header just once
Change-Id: I6fc083aa30d05c11c1b6db7b3facacf5ae857c92 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34855 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/cpu/intel/smm/gen1/smmrelocate.c5
-rw-r--r--src/include/cpu/intel/smm_reloc.h6
-rw-r--r--src/northbridge/intel/haswell/haswell.h6
-rw-r--r--src/soc/intel/broadwell/include/soc/smm.h5
-rw-r--r--src/soc/intel/cannonlake/include/soc/smm.h5
-rw-r--r--src/soc/intel/fsp_broadwell_de/include/soc/smm.h5
-rw-r--r--src/soc/intel/icelake/include/soc/smm.h5
-rw-r--r--src/soc/intel/skylake/include/soc/smm.h5
8 files changed, 6 insertions, 36 deletions
diff --git a/src/cpu/intel/smm/gen1/smmrelocate.c b/src/cpu/intel/smm/gen1/smmrelocate.c
index a26fefa1ce..9b0175d82f 100644
--- a/src/cpu/intel/smm/gen1/smmrelocate.c
+++ b/src/cpu/intel/smm/gen1/smmrelocate.c
@@ -40,11 +40,6 @@
#define G_SMRAME (1 << 3)
#define C_BASE_SEG ((0 << 2) | (1 << 1) | (0 << 0))
-struct ied_header {
- char signature[10];
- u32 size;
- u8 reserved[34];
-} __packed;
struct smm_relocation_params {
diff --git a/src/include/cpu/intel/smm_reloc.h b/src/include/cpu/intel/smm_reloc.h
index 007f20d808..5213bc909e 100644
--- a/src/include/cpu/intel/smm_reloc.h
+++ b/src/include/cpu/intel/smm_reloc.h
@@ -16,6 +16,12 @@
#include <types.h>
+struct ied_header {
+ char signature[10];
+ u32 size;
+ u8 reserved[34];
+} __packed;
+
/* These helpers are for performing SMM relocation. */
u32 northbridge_get_tseg_base(void);
u32 northbridge_get_tseg_size(void);
diff --git a/src/northbridge/intel/haswell/haswell.h b/src/northbridge/intel/haswell/haswell.h
index dc0e5db8e3..55c0b4b24b 100644
--- a/src/northbridge/intel/haswell/haswell.h
+++ b/src/northbridge/intel/haswell/haswell.h
@@ -208,12 +208,6 @@
#ifndef __ASSEMBLER__
static inline void barrier(void) { asm("" ::: "memory"); }
-struct ied_header {
- char signature[10];
- u32 size;
- u8 reserved[34];
-} __packed;
-
#ifdef __SMM__
void intel_northbridge_haswell_finalize_smm(void);
#else /* !__SMM__ */
diff --git a/src/soc/intel/broadwell/include/soc/smm.h b/src/soc/intel/broadwell/include/soc/smm.h
index 29857b7671..fece06dd63 100644
--- a/src/soc/intel/broadwell/include/soc/smm.h
+++ b/src/soc/intel/broadwell/include/soc/smm.h
@@ -19,11 +19,6 @@
#include <stdint.h>
#include <cpu/x86/msr.h>
-struct ied_header {
- char signature[10];
- u32 size;
- u8 reserved[34];
-} __packed;
struct smm_relocation_params {
u32 smram_base;
diff --git a/src/soc/intel/cannonlake/include/soc/smm.h b/src/soc/intel/cannonlake/include/soc/smm.h
index 430cca4371..95c1abd622 100644
--- a/src/soc/intel/cannonlake/include/soc/smm.h
+++ b/src/soc/intel/cannonlake/include/soc/smm.h
@@ -22,11 +22,6 @@
#include <cpu/x86/smm.h>
#include <soc/gpio.h>
-struct ied_header {
- char signature[10];
- u32 size;
- u8 reserved[34];
-} __packed;
struct smm_relocation_params {
uintptr_t ied_base;
diff --git a/src/soc/intel/fsp_broadwell_de/include/soc/smm.h b/src/soc/intel/fsp_broadwell_de/include/soc/smm.h
index 76b177466e..ae3b839802 100644
--- a/src/soc/intel/fsp_broadwell_de/include/soc/smm.h
+++ b/src/soc/intel/fsp_broadwell_de/include/soc/smm.h
@@ -20,11 +20,6 @@
#include <stdint.h>
#include <cpu/x86/msr.h>
-struct ied_header {
- char signature[10];
- u32 size;
- u8 reserved[34];
-} __packed;
struct smm_relocation_params {
u32 smram_base;
diff --git a/src/soc/intel/icelake/include/soc/smm.h b/src/soc/intel/icelake/include/soc/smm.h
index 8c1e4d8e39..43931679bf 100644
--- a/src/soc/intel/icelake/include/soc/smm.h
+++ b/src/soc/intel/icelake/include/soc/smm.h
@@ -21,11 +21,6 @@
#include <cpu/x86/smm.h>
#include <soc/gpio.h>
-struct ied_header {
- char signature[10];
- u32 size;
- u8 reserved[34];
-} __packed;
struct smm_relocation_params {
uintptr_t ied_base;
diff --git a/src/soc/intel/skylake/include/soc/smm.h b/src/soc/intel/skylake/include/soc/smm.h
index 20ddd5c941..88ce9e35c3 100644
--- a/src/soc/intel/skylake/include/soc/smm.h
+++ b/src/soc/intel/skylake/include/soc/smm.h
@@ -23,11 +23,6 @@
#include <intelblocks/smihandler.h>
#include <soc/gpio.h>
-struct ied_header {
- char signature[10];
- u32 size;
- u8 reserved[34];
-} __packed;
struct smm_relocation_params {
uintptr_t ied_base;