summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niewöhner <foss@mniewoehner.de>2021-09-26 18:41:24 +0200
committerMichael Niewöhner <foss@mniewoehner.de>2021-10-17 12:59:06 +0000
commitfbcfb63b06ad5cafc97ce76f8640e5c39b41736d (patch)
tree566b88c2e3eba53a029c67742ac75ac452f325f4
parent7b34e319f2a796446eba6c84fbe970507cc3a1c4 (diff)
downloadcoreboot-fbcfb63b06ad5cafc97ce76f8640e5c39b41736d.tar.gz
coreboot-fbcfb63b06ad5cafc97ce76f8640e5c39b41736d.tar.bz2
coreboot-fbcfb63b06ad5cafc97ce76f8640e5c39b41736d.zip
soc/intel/skylake: switch to common GNVS
Switch to common GNVS. No additional fields to those being present in common GNVS are used by any SKL/KBL device. Thus, they're dropped completely. Change-Id: I87ab4ab05f6c081697801276a744d49e9e1908e0 Signed-off-by: Michael Niewöhner <foss@mniewoehner.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/57946 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Paul Menzel <paulepanter@mailbox.org> Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
Diffstat
-rw-r--r--src/mainboard/51nb/x210/dsdt.asl2
-rw-r--r--src/mainboard/asrock/h110m/dsdt.asl2
-rw-r--r--src/mainboard/clevo/kbl-u/dsdt.asl2
-rw-r--r--src/mainboard/facebook/monolith/dsdt.asl2
-rw-r--r--src/mainboard/google/eve/dsdt.asl2
-rw-r--r--src/mainboard/google/fizz/dsdt.asl2
-rw-r--r--src/mainboard/google/glados/dsdt.asl2
-rw-r--r--src/mainboard/google/poppy/dsdt.asl2
-rw-r--r--src/mainboard/hp/280_g2/dsdt.asl2
-rw-r--r--src/mainboard/intel/kblrvp/dsdt.asl2
-rw-r--r--src/mainboard/intel/kunimitsu/dsdt.asl2
-rw-r--r--src/mainboard/intel/saddlebrook/dsdt.asl2
-rw-r--r--src/mainboard/kontron/bsl6/dsdt.asl2
-rw-r--r--src/mainboard/libretrend/lt1000/dsdt.asl2
-rw-r--r--src/mainboard/protectli/vault_kbl/dsdt.asl2
-rw-r--r--src/mainboard/purism/librem_skl/dsdt.asl2
-rw-r--r--src/mainboard/razer/blade_stealth_kbl/dsdt.asl2
-rw-r--r--src/mainboard/supermicro/x11-lga1151-series/dsdt.asl2
-rw-r--r--src/soc/intel/skylake/acpi/globalnvs.asl47
-rw-r--r--src/soc/intel/skylake/include/soc/nvs.h45
20 files changed, 19 insertions, 109 deletions
diff --git a/src/mainboard/51nb/x210/dsdt.asl b/src/mainboard/51nb/x210/dsdt.asl
index 398611f6a457..b4d7741431cf 100644
--- a/src/mainboard/51nb/x210/dsdt.asl
+++ b/src/mainboard/51nb/x210/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
{
#include <acpi/dsdt_top.asl>
#include <cpu/intel/common/acpi/cpu.asl>
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl>
Device (\_SB.PCI0)
diff --git a/src/mainboard/asrock/h110m/dsdt.asl b/src/mainboard/asrock/h110m/dsdt.asl
index 22571573f854..517f759b5242 100644
--- a/src/mainboard/asrock/h110m/dsdt.asl
+++ b/src/mainboard/asrock/h110m/dsdt.asl
@@ -14,7 +14,7 @@ DefinitionBlock(
#include <soc/intel/common/block/acpi/acpi/platform.asl>
// global NVS and variables
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
// CPU
#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/clevo/kbl-u/dsdt.asl b/src/mainboard/clevo/kbl-u/dsdt.asl
index 1440ebe71ccf..21d18c6363ec 100644
--- a/src/mainboard/clevo/kbl-u/dsdt.asl
+++ b/src/mainboard/clevo/kbl-u/dsdt.asl
@@ -11,7 +11,7 @@ DefinitionBlock(
)
{
#include <acpi/dsdt_top.asl>
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
#include <cpu/intel/common/acpi/cpu.asl>
Device (\_SB.PCI0) {
diff --git a/src/mainboard/facebook/monolith/dsdt.asl b/src/mainboard/facebook/monolith/dsdt.asl
index 79de62240089..225acfaee1c5 100644
--- a/src/mainboard/facebook/monolith/dsdt.asl
+++ b/src/mainboard/facebook/monolith/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
#include <acpi/dsdt_top.asl>
#include <cpu/intel/common/acpi/cpu.asl>
#include <soc/intel/common/block/acpi/acpi/platform.asl>
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl>
Scope (\_SB) {
diff --git a/src/mainboard/google/eve/dsdt.asl b/src/mainboard/google/eve/dsdt.asl
index 2b0dd85a889e..357f3bfe6f7b 100644
--- a/src/mainboard/google/eve/dsdt.asl
+++ b/src/mainboard/google/eve/dsdt.asl
@@ -17,7 +17,7 @@ DefinitionBlock(
#include <soc/intel/common/block/acpi/acpi/platform.asl>
/* global NVS and variables */
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
/* CPU */
#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/google/fizz/dsdt.asl b/src/mainboard/google/fizz/dsdt.asl
index 9800126ed1cb..01e94f2f7794 100644
--- a/src/mainboard/google/fizz/dsdt.asl
+++ b/src/mainboard/google/fizz/dsdt.asl
@@ -17,7 +17,7 @@ DefinitionBlock(
#include <soc/intel/common/block/acpi/acpi/platform.asl>
/* global NVS and variables */
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
/* CPU */
#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/google/glados/dsdt.asl b/src/mainboard/google/glados/dsdt.asl
index 039c406cc74d..e25c4319a120 100644
--- a/src/mainboard/google/glados/dsdt.asl
+++ b/src/mainboard/google/glados/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
#include <acpi/dsdt_top.asl>
#include <cpu/intel/common/acpi/cpu.asl>
#include <soc/intel/common/block/acpi/acpi/platform.asl>
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl>
Scope (\_SB) {
diff --git a/src/mainboard/google/poppy/dsdt.asl b/src/mainboard/google/poppy/dsdt.asl
index cf4692e416ec..dbba8064e07a 100644
--- a/src/mainboard/google/poppy/dsdt.asl
+++ b/src/mainboard/google/poppy/dsdt.asl
@@ -17,7 +17,7 @@ DefinitionBlock(
#include <soc/intel/common/block/acpi/acpi/platform.asl>
/* global NVS and variables */
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
/* CPU */
#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/mainboard/hp/280_g2/dsdt.asl b/src/mainboard/hp/280_g2/dsdt.asl
index 26ebbe071f17..184fee0d3ae6 100644
--- a/src/mainboard/hp/280_g2/dsdt.asl
+++ b/src/mainboard/hp/280_g2/dsdt.asl
@@ -15,7 +15,7 @@ DefinitionBlock(
#include <cpu/intel/common/acpi/cpu.asl>
#include <soc/intel/common/block/acpi/acpi/platform.asl>
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
Device (\_SB.PCI0) {
#include <soc/intel/skylake/acpi/systemagent.asl>
diff --git a/src/mainboard/intel/kblrvp/dsdt.asl b/src/mainboard/intel/kblrvp/dsdt.asl
index 3afa5836bd5c..5af8829ff397 100644
--- a/src/mainboard/intel/kblrvp/dsdt.asl
+++ b/src/mainboard/intel/kblrvp/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
#include <acpi/dsdt_top.asl>
#include <cpu/intel/common/acpi/cpu.asl>
#include <soc/intel/common/block/acpi/acpi/platform.asl>
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl>
Scope (\_SB) {
diff --git a/src/mainboard/intel/kunimitsu/dsdt.asl b/src/mainboard/intel/kunimitsu/dsdt.asl
index 490b50ae77f4..2ae3dca2d2c9 100644
--- a/src/mainboard/intel/kunimitsu/dsdt.asl
+++ b/src/mainboard/intel/kunimitsu/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
#include <acpi/dsdt_top.asl>
#include <cpu/intel/common/acpi/cpu.asl>
#include <soc/intel/common/block/acpi/acpi/platform.asl>
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl>
Scope (\_SB) {
diff --git a/src/mainboard/intel/saddlebrook/dsdt.asl b/src/mainboard/intel/saddlebrook/dsdt.asl
index e2291da3f9cf..1ec9ab022da6 100644
--- a/src/mainboard/intel/saddlebrook/dsdt.asl
+++ b/src/mainboard/intel/saddlebrook/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
#include <acpi/dsdt_top.asl>
#include <cpu/intel/common/acpi/cpu.asl>
#include <soc/intel/common/block/acpi/acpi/platform.asl>
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl>
Device (\_SB.PCI0)
diff --git a/src/mainboard/kontron/bsl6/dsdt.asl b/src/mainboard/kontron/bsl6/dsdt.asl
index ee425e874d6a..916e3713f0f8 100644
--- a/src/mainboard/kontron/bsl6/dsdt.asl
+++ b/src/mainboard/kontron/bsl6/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
#include <acpi/dsdt_top.asl>
#include <cpu/intel/common/acpi/cpu.asl>
#include <soc/intel/common/block/acpi/acpi/platform.asl>
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
Device (\_SB.PCI0) {
#include <soc/intel/skylake/acpi/systemagent.asl>
diff --git a/src/mainboard/libretrend/lt1000/dsdt.asl b/src/mainboard/libretrend/lt1000/dsdt.asl
index 890b969a9075..9f02d56fc627 100644
--- a/src/mainboard/libretrend/lt1000/dsdt.asl
+++ b/src/mainboard/libretrend/lt1000/dsdt.asl
@@ -12,7 +12,7 @@ DefinitionBlock(
{
#include <acpi/dsdt_top.asl>
#include <soc/intel/common/block/acpi/acpi/platform.asl>
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
#include <cpu/intel/common/acpi/cpu.asl>
Device (\_SB.PCI0)
diff --git a/src/mainboard/protectli/vault_kbl/dsdt.asl b/src/mainboard/protectli/vault_kbl/dsdt.asl
index 890b969a9075..9f02d56fc627 100644
--- a/src/mainboard/protectli/vault_kbl/dsdt.asl
+++ b/src/mainboard/protectli/vault_kbl/dsdt.asl
@@ -12,7 +12,7 @@ DefinitionBlock(
{
#include <acpi/dsdt_top.asl>
#include <soc/intel/common/block/acpi/acpi/platform.asl>
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
#include <cpu/intel/common/acpi/cpu.asl>
Device (\_SB.PCI0)
diff --git a/src/mainboard/purism/librem_skl/dsdt.asl b/src/mainboard/purism/librem_skl/dsdt.asl
index 43c8e7f26b06..ee71d1ab410c 100644
--- a/src/mainboard/purism/librem_skl/dsdt.asl
+++ b/src/mainboard/purism/librem_skl/dsdt.asl
@@ -13,7 +13,7 @@ DefinitionBlock(
#include <acpi/dsdt_top.asl>
#include <cpu/intel/common/acpi/cpu.asl>
#include <soc/intel/common/block/acpi/acpi/platform.asl>
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl>
Device (\_SB.PCI0)
diff --git a/src/mainboard/razer/blade_stealth_kbl/dsdt.asl b/src/mainboard/razer/blade_stealth_kbl/dsdt.asl
index 5fd356954613..e30457765641 100644
--- a/src/mainboard/razer/blade_stealth_kbl/dsdt.asl
+++ b/src/mainboard/razer/blade_stealth_kbl/dsdt.asl
@@ -14,7 +14,7 @@ DefinitionBlock(
#include <acpi/dsdt_top.asl>
#include <cpu/intel/common/acpi/cpu.asl>
#include <soc/intel/common/block/acpi/acpi/platform.asl>
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
#include <southbridge/intel/common/acpi/sleepstates.asl>
Device (\_SB.PCI0)
diff --git a/src/mainboard/supermicro/x11-lga1151-series/dsdt.asl b/src/mainboard/supermicro/x11-lga1151-series/dsdt.asl
index ad20f909c5e8..20b4aefc96a6 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/dsdt.asl
+++ b/src/mainboard/supermicro/x11-lga1151-series/dsdt.asl
@@ -14,7 +14,7 @@ DefinitionBlock(
#include <soc/intel/common/block/acpi/acpi/platform.asl>
// global NVS and variables
- #include <soc/intel/skylake/acpi/globalnvs.asl>
+ #include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
// CPU
#include <cpu/intel/common/acpi/cpu.asl>
diff --git a/src/soc/intel/skylake/acpi/globalnvs.asl b/src/soc/intel/skylake/acpi/globalnvs.asl
deleted file mode 100644
index 3623656ea50f..000000000000
--- a/src/soc/intel/skylake/acpi/globalnvs.asl
+++ /dev/null
@@ -1,47 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-/* Global Variables */
-
-Field (GNVS, ByteAcc, NoLock, Preserve)
-{
- /* Miscellaneous */
- , 16, // 0x00 - Operating System
- SMIF, 8, // 0x02 - SMI function
- , 8, // 0x03 - SMI function parameter
- , 8, // 0x04 - SMI function parameter
- SCIF, 8, // 0x05 - SCI function
- , 8, // 0x06 - SCI function parameter
- , 8, // 0x07 - SCI function parameter
- , 8, // 0x08 - Global Lock function for EC
- , 8, // 0x09 - Lock function parameter
- , 8, // 0x0a - Lock function parameter
- , 8, // 0x0b - Processor Count
- PPCM, 8, // 0x0c - Max PPC State
- TMPS, 8, // 0x0d - Temperature Sensor ID
- TLVL, 8, // 0x0e - Throttle Level Limit
- FLVL, 8, // 0x0f - Current FAN Level
- TCRT, 8, // 0x10 - Critical Threshold
- TPSV, 8, // 0x11 - Passive Threshold
- TMAX, 8, // 0x12 - CPU Tj_max
- S5U0, 8, // 0x13 - Enable USB in S5
- S3U0, 8, // 0x14 - Enable USB in S3
- S33G, 8, // 0x15 - Enable 3G in S3
- LIDS, 8, // 0x16 - LID State
- , 8, // 0x17 - AC Power State
- , 32, // 0x18 - 0x1b - CBMEM TOC
- CBMC, 32, // 0x1c - 0x1f - coreboot Memory Console
- PM1I, 64, // 0x20 - 0x27 - PM1 wake status bit
- GPEI, 64, // 0x28 - 0x2f - GPE wake status bit
- DPTE, 8, // 0x30 - Enable DPTF
- NHLA, 64, // 0x31 - NHLT Address
- NHLL, 32, // 0x39 - NHLT Length
- , 16, // 0x3d - Wifi Country Identifier
- U2WE, 16, // 0x3f - USB2 Wake Enable Bitmap
- U3WE, 8, // 0x41 - USB3 Wake Enable Bitmap
- UIOR, 8, // 0x42 - UART debug controller init on S3 resume
- EPCS, 8, // 0x43 - SGX Enabled status
- EMNA, 64, // 0x44 - 0x4B EPC base address
- ELNG, 64, // 0x4C - 0x53 EPC Length
- A4GB, 64, // 0x54 - 0x5B Base of above 4GB MMIO Resource
- A4GS, 64, // 0x5C - 0x63 Length of above 4GB MMIO Resource
-}
diff --git a/src/soc/intel/skylake/include/soc/nvs.h b/src/soc/intel/skylake/include/soc/nvs.h
index 6d5e17256c8e..512945898e24 100644
--- a/src/soc/intel/skylake/include/soc/nvs.h
+++ b/src/soc/intel/skylake/include/soc/nvs.h
@@ -3,49 +3,6 @@
#ifndef _SOC_NVS_H_
#define _SOC_NVS_H_
-#include <stdint.h>
-
-struct __packed global_nvs {
- /* Miscellaneous */
- u16 unused_was_osys; /* 0x00 - Operating System */
- u8 smif; /* 0x02 - SMI function call ("TRAP") */
- u8 unused_was_prm0; /* 0x03 - SMI function call parameter */
- u8 unused_was_prm1; /* 0x04 - SMI function call parameter */
- u8 scif; /* 0x05 - SCI function call (via _L00) */
- u8 unused_was_prm2; /* 0x06 - SCI function call parameter */
- u8 unused_was_prm3; /* 0x07 - SCI function call parameter */
- u8 unused_was_lckf; /* 0x08 - Global Lock function for EC */
- u8 unused_was_prm4; /* 0x09 - Lock function parameter */
- u8 unused_was_prm5; /* 0x0a - Lock function parameter */
- u8 unused_was_pcnt; /* 0x0b - Processor Count */
- u8 ppcm; /* 0x0c - Max PPC State */
- u8 tmps; /* 0x0d - Temperature Sensor ID */
- u8 tlvl; /* 0x0e - Throttle Level Limit */
- u8 flvl; /* 0x0f - Current FAN Level */
- u8 tcrt; /* 0x10 - Critical Threshold */
- u8 tpsv; /* 0x11 - Passive Threshold */
- u8 tmax; /* 0x12 - CPU Tj_max */
- u8 s5u0; /* 0x13 - Enable USB in S5 */
- u8 s3u0; /* 0x14 - Enable USB in S3 */
- u8 s33g; /* 0x15 - Enable 3G in S3 */
- u8 lids; /* 0x16 - LID State */
- u8 unused_was_pwrs; /* 0x17 - AC Power State */
- u32 obsolete_cmem; /* 0x18 - 0x1b - CBMEM TOC */
- u32 cbmc; /* 0x1c - 0x1f - coreboot Memory Console */
- u64 pm1i; /* 0x20 - 0x27 - PM1 wake status bit */
- u64 gpei; /* 0x28 - 0x2f - GPE wake status bit */
- u8 dpte; /* 0x30 - Enable DPTF */
- u64 nhla; /* 0x31 - NHLT Address */
- u32 nhll; /* 0x39 - NHLT Length */
- u16 unused_was_cid1; /* 0x3d - Wifi Country Identifier */
- u16 u2we; /* 0x3f - USB2 Wake Enable Bitmap */
- u8 u3we; /* 0x41 - USB3 Wake Enable Bitmap */
- u8 uior; /* 0x42 - UART debug controller init on S3 resume */
- u8 epcs; /* 0x43 - SGX Enabled status */
- u64 emna; /* 0x44 - 0x4B EPC base address */
- u64 elng; /* 0x4C - 0x53 EPC Length */
- u64 a4gb; /* 0x54 - 0x5B Base of above 4GB MMIO Resource */
- u64 a4gs; /* 0x5C - 0x63 Length of above 4GB MMIO Resource */
-};
+#include <intelblocks/nvs.h>
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 19:10:16 +0000