diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-12-19 16:19:44 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-01-18 18:02:27 +0000 |
| commit | 66c6413c69abb7335efc4ea07f4c811c042704b6 (patch) | |
| tree | 06d58b85da4c779cca7b78e33a069ea03a4e69e4 /src/soc/intel/common/block/include/intelblocks/nvs.h | |
| parent | c4a6628a6fe4f5400b7abe1478d0b0b21cb8200f (diff) | |
ACPI: Refactor ChromeOS specific ACPI GNVS
The layout of GNVS has expectation for a fixed size
array for chromeos_acpi_t. This allows us to reduce
the exposure of <chromeos/gnvs.h>.
If chromeos_acpi_t was the last entry in struct global_nvs
padding at the end is also removed.
If device_nvs_t exists, place a properly sized reserve for
chromeos_acpi_t in the middle.
Allocation from cbmem is adjusted such that it matches exactly
the OperationRegion size defined inside the ASL.
Change-Id: If234075e11335ce958ce136dd3fe162f7e5afdf7
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48788
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/soc/intel/common/block/include/intelblocks/nvs.h')
| -rw-r--r-- | src/soc/intel/common/block/include/intelblocks/nvs.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/soc/intel/common/block/include/intelblocks/nvs.h b/src/soc/intel/common/block/include/intelblocks/nvs.h index 38edfc769c..2f3ac1cc0b 100644 --- a/src/soc/intel/common/block/include/intelblocks/nvs.h +++ b/src/soc/intel/common/block/include/intelblocks/nvs.h @@ -4,8 +4,6 @@ #define SOC_INTEL_COMMON_BLOCK_NVS_H #include <stdint.h> -#include <commonlib/helpers.h> -#include <vendorcode/google/chromeos/gnvs.h> struct __packed global_nvs { /* Miscellaneous */ @@ -28,12 +26,6 @@ struct __packed global_nvs { u8 uior; /* 0x2f - UART debug controller init on S3 resume */ u64 a4gb; /* 0x30 - 0x37 Base of above 4GB MMIO Resource */ u64 a4gs; /* 0x38 - 0x3f Length of above 4GB MMIO Resource */ - u8 unused[192]; - - /* ChromeOS specific (0x100 - 0xfff) */ - chromeos_acpi_t chromeos; }; -check_member(global_nvs, chromeos, GNVS_CHROMEOS_ACPI_OFFSET); - #endif |