soc/amd/mendocino: clean up global NVS

From Cezanne on, the TMPS, TCRT and TPSV fields are unused in both the C
and ACPI code, so they can be removed. Also remove the unused fields
that were previously used for PCNT and PWRS. The LIDS field is only used
in the ACPI code, but keep if for now, since it would require a bigger
rework to remove it from the global NVS.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I884d6a7dedb73028f8942fdda86b0c9910fa996a
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72094
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Felix Held 2023-01-19 18:11:46 +01:00
parent b2394e853b
commit 98391baf3b
2 changed files with 8 additions and 22 deletions

View File

@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
/* TODO: Check if this is still correct */
/* /*
* NOTE: The layout of the GNVS structure below must match the layout in * NOTE: The layout of the GNVS structure below must match the layout in
* soc/amd/mendocino/include/soc/nvs.h !!! * soc/amd/mendocino/include/soc/nvs.h !!!
@ -10,13 +8,8 @@
Field (GNVS, ByteAcc, NoLock, Preserve) Field (GNVS, ByteAcc, NoLock, Preserve)
{ {
/* Miscellaneous */ /* Miscellaneous */
, 8, // 0x00 - Processor Count LIDS, 8, // 0x00 - LID State
LIDS, 8, // 0x01 - LID State CBMC, 32, // 0x01 - 0x04 - coreboot Memory Console
, 8, // 0x02 - AC Power State PM1I, 64, // 0x05 - 0x0c - System Wake Source - PM1 Index
CBMC, 32, // 0x03 - 0x06 - coreboot Memory Console GPEI, 64, // 0x0d - 0x14 - GPE Wake Source
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
} }

View File

@ -1,7 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */ /* SPDX-License-Identifier: GPL-2.0-or-later */
/* TODO: Check if this is still correct */
/* /*
* NOTE: The layout of the global_nvs structure below must match the layout * NOTE: The layout of the global_nvs structure below must match the layout
* in soc/soc/amd/mendocino/acpi/globalnvs.asl !!! * in soc/soc/amd/mendocino/acpi/globalnvs.asl !!!
@ -15,15 +13,10 @@
struct __packed global_nvs { struct __packed global_nvs {
/* Miscellaneous */ /* Miscellaneous */
uint8_t unused_was_pcnt; /* 0x00 - Processor Count */ uint8_t lids; /* 0x00 - LID State */
uint8_t lids; /* 0x01 - LID State */ uint32_t cbmc; /* 0x01 - 0x04 - coreboot Memory Console */
uint8_t unused_was_pwrs; /* 0x02 - AC Power State */ uint64_t pm1i; /* 0x05 - 0x0c - System Wake Source - PM1 Index */
uint32_t cbmc; /* 0x03 - 0x06 - coreboot Memory Console */ uint64_t gpei; /* 0x0d - 0x14 - GPE Wake Source */
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 */
}; };
#endif /* AMD_MENDOCINO_NVS_H */ #endif /* AMD_MENDOCINO_NVS_H */