summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/soc/amd/stoneyridge/acpi/globalnvs.asl38
-rw-r--r--src/soc/amd/stoneyridge/include/soc/nvs.h42
2 files changed, 30 insertions, 50 deletions
diff --git a/src/soc/amd/stoneyridge/acpi/globalnvs.asl b/src/soc/amd/stoneyridge/acpi/globalnvs.asl
index 2865352506..0acc408f0f 100644
--- a/src/soc/amd/stoneyridge/acpi/globalnvs.asl
+++ b/src/soc/amd/stoneyridge/acpi/globalnvs.asl
@@ -14,25 +14,15 @@ Field (GNVS, ByteAcc, NoLock, Preserve)
/* Miscellaneous */
Offset (0x00),
PCNT, 8, // 0x00 - Processor Count
- PPCM, 8, // 0x01 - Max PPC State
- LIDS, 8, // 0x02 - LID State
- PWRS, 8, // 0x03 - AC Power State
- DPTE, 8, // 0x04 - Enable DPTF
- CBMC, 32, // 0x05 - 0x08 - coreboot Memory Console
- PM1I, 64, // 0x09 - 0x10 - System Wake Source - PM1 Index
- GPEI, 64, // 0x11 - 0x18 - GPE Wake Source
- NHLA, 64, // 0x19 - 0x20 - NHLT Address
- NHLL, 32, // 0x21 - 0x24 - NHLT Length
- PRT0, 32, // 0x25 - 0x28 - PERST_0 Address
- SCDP, 8, // 0x29 - SD_CD GPIO portid
- SCDO, 8, // 0x2A - GPIO pad offset relative to the community
- TMPS, 8, // 0x2B - Temperature Sensor ID
- TLVL, 8, // 0x2C - Throttle Level Limit
- FLVL, 8, // 0x2D - Current FAN Level
- TCRT, 8, // 0x2E - Critical Threshold
- TPSV, 8, // 0x2F - Passive Threshold
- TMAX, 8, // 0x30 - CPU Tj_max
- Offset (0x34), // 0x34 - AOAC Device Enables
+ LIDS, 8, // 0x01 - LID State
+ PWRS, 8, // 0x02 - AC Power State
+ CBMC, 32, // 0x03 - 0x06 - coreboot Memory Console
+ PM1I, 64, // 0x07 - 0x0e - System Wake Source - PM1 Index
+ GPEI, 64, // 0x0f - 0x16 - GPE Wake Source
+ TMPS, 8, // 0x17 - Temperature Sensor ID
+ TCRT, 8, // 0x18 - Critical Threshold
+ TPSV, 8, // 0x19 - Passive Threshold
+ Offset (0x20), // 0x20 - AOAC Device Enables
, 5,
IC0E, 1, // I2C0, 5
IC1E, 1, // I2C1, 6
@@ -51,11 +41,11 @@ Field (GNVS, ByteAcc, NoLock, Preserve)
, 2,
ESPI, 1, // ESPI, 27
, 4,
- FW00, 16, // 0x38 - xHCI FW ROM addr, boot RAM
- FW02, 16, // 0x3A - xHCI FW ROM addr, Instruction RAM
- FW01, 32, // 0x3C - xHCI FW RAM addr, boot RAM
- FW03, 32, // 0x40 - xHCI FW RAM addr, Instruction RAM
- EH10, 32, // 0x44 - EHCI BAR
+ FW00, 16, // 0x24 - xHCI FW ROM addr, boot RAM
+ FW02, 16, // 0x26 - xHCI FW ROM addr, Instruction RAM
+ FW01, 32, // 0x28 - xHCI FW RAM addr, boot RAM
+ FW03, 32, // 0x2c - xHCI FW RAM addr, Instruction RAM
+ EH10, 32, // 0x30 - EHCI BAR
/* ChromeOS stuff (0x100 -> 0xfff, size 0xeff) */
Offset (0x100),
#include <vendorcode/google/chromeos/acpi/gnvs.asl>
diff --git a/src/soc/amd/stoneyridge/include/soc/nvs.h b/src/soc/amd/stoneyridge/include/soc/nvs.h
index 864cfffa1a..9c479c6e62 100644
--- a/src/soc/amd/stoneyridge/include/soc/nvs.h
+++ b/src/soc/amd/stoneyridge/include/soc/nvs.h
@@ -17,32 +17,22 @@
struct __packed global_nvs {
/* Miscellaneous */
uint8_t pcnt; /* 0x00 - Processor Count */
- uint8_t ppcm; /* 0x01 - Max PPC State */
- uint8_t lids; /* 0x02 - LID State */
- uint8_t pwrs; /* 0x03 - AC Power State */
- uint8_t dpte; /* 0x04 - Enable DPTF */
- uint32_t cbmc; /* 0x05 - 0x08 - coreboot Memory Console */
- uint64_t pm1i; /* 0x09 - 0x10 - System Wake Source - PM1 Index */
- uint64_t gpei; /* 0x11 - 0x18 - GPE Wake Source */
- uint64_t nhla; /* 0x19 - 0x20 - NHLT Address */
- uint32_t nhll; /* 0x21 - 0x24 - NHLT Length */
- uint32_t prt0; /* 0x25 - 0x28 - PERST_0 Address */
- uint8_t scdp; /* 0x29 - SD_CD GPIO portid */
- uint8_t scdo; /* 0x2A - GPIO pad relative offset */
- uint8_t tmps; /* 0x2B - Temperature Sensor ID */
- uint8_t tlvl; /* 0x2C - Throttle Level Limit */
- uint8_t flvl; /* 0x2D - Current FAN Level */
- uint8_t tcrt; /* 0x2E - Critical Threshold */
- uint8_t tpsv; /* 0x2F - Passive Threshold */
- uint8_t tmax; /* 0x30 - CPU Tj_max */
- uint8_t pad1[3];
- aoac_devs_t aoac; /* 0x34 - AOAC device enables */
- uint16_t fw00; /* 0x38 - XhciFwRomAddr_Rom, Boot RAM */
- uint16_t fw02; /* 0x3A - XhciFwRomAddr_Ram, Instr RAM */
- uint32_t fw01; /* 0x3C - XhciFwRamAddr_Rom, Boot RAM sz/base */
- uint32_t fw03; /* 0x40 - XhciFwRomAddr_Ram, Instr RAM sz/base */
- uint32_t eh10; /* 0x40 - EHCI BAR */
- uint8_t unused[184];
+ uint8_t lids; /* 0x01 - LID State */
+ uint8_t pwrs; /* 0x02 - AC Power State */
+ uint32_t cbmc; /* 0x03 - 0x06 - coreboot Memory Console */
+ uint64_t pm1i; /* 0x07 - 0x0e - System Wake Source - PM1 Index */
+ uint64_t gpei; /* 0x0f - 0x16 - GPE Wake Source */
+ uint8_t tmps; /* 0x17 - Temperature Sensor ID */
+ uint8_t tcrt; /* 0x18 - Critical Threshold */
+ uint8_t tpsv; /* 0x19 - Passive Threshold */
+ uint8_t pad1[6];
+ aoac_devs_t aoac; /* 0x20 - AOAC device enables */
+ uint16_t fw00; /* 0x24 - XhciFwRomAddr_Rom, Boot RAM */
+ uint16_t fw02; /* 0x26 - XhciFwRomAddr_Ram, Instr RAM */
+ uint32_t fw01; /* 0x28 - XhciFwRamAddr_Rom, Boot RAM sz/base */
+ uint32_t fw03; /* 0x2c - XhciFwRomAddr_Ram, Instr RAM sz/base */
+ uint32_t eh10; /* 0x30 - EHCI BAR */
+ uint8_t unused[204];
/* ChromeOS specific (0x100 - 0xfff) */
chromeos_acpi_t chromeos;