soc/intel/xeon_sp/nvs: Use common global NVS

The xeon_sp ACPI NVS and ramstage NVS were out of sync. Since there
isn't anything uncommon with the soc NVS, use the Intel common NVS.
This covers the NVS cases of common code used by xeon_sp.  Update
the mainboards for this change.

Change-Id: Icf422f5b75a1ca7a3d8f3d63638b8d86a56fdd7b
Signed-off-by: Marc Jones <marcjones@sysproconsulting.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48491
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Jay Talbott <JayTalbott@sysproconsulting.com>

4 files changed, 4 insertions, 79 deletions

diff --git a/src/mainboard/ocp/deltalake/dsdt.asl b/src/mainboard/ocp/deltalake/dsdt.asl
index 1541134e72..63aeb700c2 100644
--- a/src/mainboard/ocp/deltalake/dsdt.asl
+++ b/src/mainboard/ocp/deltalake/dsdt.asl
@@ -14,7 +14,7 @@ DefinitionBlock(
 	#include "acpi/platform.asl"
 
 	// global NVS and variables
-	#include <soc/intel/xeon_sp/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 
 	#include <cpu/intel/common/acpi/cpu.asl>
 
diff --git a/src/mainboard/ocp/tiogapass/dsdt.asl b/src/mainboard/ocp/tiogapass/dsdt.asl
index 7905a9c5ef..7fa518bd87 100644
--- a/src/mainboard/ocp/tiogapass/dsdt.asl
+++ b/src/mainboard/ocp/tiogapass/dsdt.asl
@@ -12,7 +12,7 @@ DefinitionBlock(
 )
 {
 	#include "acpi/platform.asl"
-	#include <soc/intel/xeon_sp/acpi/globalnvs.asl>
+	#include <soc/intel/common/block/acpi/acpi/globalnvs.asl>
 	#include <cpu/intel/common/acpi/cpu.asl>
 	#include <soc/intel/xeon_sp/acpi/uncore.asl>
 	Scope (\_SB.PC00)
diff --git a/src/soc/intel/xeon_sp/acpi/globalnvs.asl b/src/soc/intel/xeon_sp/acpi/globalnvs.asl
deleted file mode 100644
index 00848cc45c..0000000000
--- a/src/soc/intel/xeon_sp/acpi/globalnvs.asl
+++ /dev/null
@@ -1,63 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-/* Global Variables */
-
-Name(\PICM, 0)		// IOAPIC/8259
-
-/*
- * Global ACPI memory region. This region is used for passing information
- * between coreboot (aka "the system bios"), ACPI, and the SMI handler.
- * Since we don't know where this will end up in memory at ACPI compile time,
- * we have to fix it up in coreboot's ACPI creation phase.
- */
-
-External(NVSA)
-OperationRegion (GNVS, SystemMemory, NVSA, 0x2000)
-Field (GNVS, ByteAcc, NoLock, Preserve)
-{
-	/* Miscellaneous */
-	OSYS,	16,	// 0x00 - Operating System
-	SMIF,	 8,	// 0x02 - SMI function
-	PRM0,	 8,	// 0x03 - SMI function parameter
-	PRM1,	 8,	// 0x04 - SMI function parameter
-	SCIF,	 8,	// 0x05 - SCI function
-	PRM2,	 8,	// 0x06 - SCI function parameter
-	PRM3,	 8,	// 0x07 - SCI function parameter
-	LCKF,	 8,	// 0x08 - Global Lock function for EC
-	PRM4,	 8,	// 0x09 - Lock function parameter
-	PRM5,	 8,	// 0x0a - Lock function parameter
-	P80D,	32,	// 0x0b - Debug port (IO 0x80) value
-	LIDS,	 8,	// 0x0f - LID state (open = 1)
-	PWRS,	 8,	// 0x10 - Power State (AC = 1)
-	PCNT,	 8,	// 0x11 - Processor count
-	TPMP,	 8,	// 0x12 - TPM Present and Enabled
-	TLVL,	 8,	// 0x13 - Throttle Level
-	PPCM,	 8,	// 0x14 - Maximum P-state usable by OS
-	PM1I,	64,	// 0x15 - PM1 wake status bit
-	GPEI,	64,	// 0x1D - GPE wake status bit
-	U2WE,	16,	// 0x25 - USB2 Wake Enable Bitmap
-	U3WE,	 8,	// 0x27 - USB3 Wake Enable Bitmap
-
-	/* Device Config */
-	Offset (0x30),
-	S5U0,	 8,	// 0x30 - Enable USB0 in S5
-	S5U1,	 8,	// 0x31 - Enable USB1 in S5
-	S3U0,	 8,	// 0x32 - Enable USB0 in S3
-	S3U1,	 8,	// 0x33 - Enable USB1 in S3
-	TACT,	 8,	// 0x34 - Thermal Active trip point
-	TPSV,	 8,	// 0x35 - Thermal Passive trip point
-	TCRT,	 8,	// 0x36 - Thermal Critical trip point
-	DPTE,	 8,	// 0x37 - Enable DPTF
-
-	/* Base addresses */
-	Offset (0x50),
-	CMEM,	 32,	// 0x50 - CBMEM TOC
-	TOLM,	 32,	// 0x54 - Top of Low Memory
-	CBMC,	 32,	// 0x58 - coreboot mem console pointer
-	MMOB,	 32,	// 0x5C - MMIO Base Low Base
-	MMOL,	 32,	// 0x60 - MMIO Base Low Limit
-	MMHB,	 64,	// 0x64 - MMIO Base High Base
-	MMHL,	 64,	// 0x6C - MMIO Base High Limit
-	TSGB,	 32,	// 0x74 - TSEG Base
-	TSSZ,	 32,	// 0x78 - TSEG Size
-}
diff --git a/src/soc/intel/xeon_sp/include/soc/nvs.h b/src/soc/intel/xeon_sp/include/soc/nvs.h
index 100a442178..512945898e 100644
--- a/src/soc/intel/xeon_sp/include/soc/nvs.h
+++ b/src/soc/intel/xeon_sp/include/soc/nvs.h
@@ -3,18 +3,6 @@
 #ifndef _SOC_NVS_H_
 #define _SOC_NVS_H_
 
-#include <stdint.h>
+#include <intelblocks/nvs.h>
 
-/* TODO - this requires xeon sp, server board support */
-/* NOTE: We do not use intelblocks/nvs.h since it includes
-   mostly client specific attributes */
-
-/* TODO: This is not aligned with the ACPI asl code */
-struct __packed global_nvs {
-	uint8_t  pcnt;        /* 0x00 - Processor Count */
-	uint32_t cbmc;	      /* 0x01 - coreboot memconsole */
-	uint8_t uior;
-	uint8_t rsvd3[250];
-};
-
-#endif /* _SOC_NVS_H_ */
+#endif