From 0781cbe1d33e62a26a234962bc271209cc22c931 Mon Sep 17 00:00:00 2001 From: Jonathan Neuschäfer Date: Mon, 30 Oct 2017 17:20:18 +0100 Subject: sb and soc: Enforce correct offset of member "chromeos" in global_nvs_t MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The padding has recently been broken in commit 90ebf96df5 ("soc/intel/skylake: Add GNVS variables and include SGX ASL") and fixed again in commit af88398887 ("soc/intel/skylake: Fix broken GNVS offset for chromeos"). Avoid this bug in the future. Change-Id: I1bf3027bba239c8747ad26a3130a7e047d3b8c94 Signed-off-by: Jonathan Neuschäfer Reviewed-on: https://review.coreboot.org/22229 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Paul Menzel --- src/southbridge/intel/bd82x6x/nvs.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/southbridge/intel/bd82x6x') diff --git a/src/southbridge/intel/bd82x6x/nvs.h b/src/southbridge/intel/bd82x6x/nvs.h index 51fc7bb1f4..207f763cee 100644 --- a/src/southbridge/intel/bd82x6x/nvs.h +++ b/src/southbridge/intel/bd82x6x/nvs.h @@ -14,10 +14,12 @@ * GNU General Public License for more details. */ -#include +#include #include +#include #include "vendorcode/google/chromeos/gnvs.h" -typedef struct { + +typedef struct global_nvs_t { /* Miscellaneous */ u16 osys; /* 0x00 - Operating System */ u8 smif; /* 0x02 - SMI function call ("TRAP") */ @@ -152,6 +154,7 @@ typedef struct { /* ChromeOS specific (starts at 0x100)*/ chromeos_acpi_t chromeos; } __packed global_nvs_t; +check_member(global_nvs_t, chromeos, 0x100); #ifdef __SMM__ /* Used in SMM to find the ACPI GNVS address */ -- cgit v1.2.3