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>
This commit is contained in:
Michael Niewöhner
parent
7b34e319f2
commit
fbcfb63b06
@ -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)
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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
|
||||
}
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user