Change in coreboot[master]: soc/intel/common: add SGX fields to GNVS

[Michael Niewöhner (Code Review)]

Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/57947 )

Change subject: soc/intel/common: add SGX fields to GNVS
......................................................................

soc/intel/common: add SGX fields to GNVS

Add the SGX fields to the GNVS. This is required for Skylake to use the
common GNVS.

Change-Id: I0077260b7eb1bc2b2fe2af69ac039b38ca0e7423
Signed-off-by: Michael Niewöhner 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57947
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
Reviewed-by: Nico Huber 
Reviewed-by: Paul Menzel 
---
M src/soc/intel/common/block/acpi/acpi/globalnvs.asl
M src/soc/intel/common/block/include/intelblocks/nvs.h
2 files changed, 7 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved
  Paul Menzel: Looks good to me, but someone else must approve
  Angel Pons: Looks good to me, but someone else must approve

diff --git a/src/soc/intel/common/block/acpi/acpi/globalnvs.asl b/src/soc/intel/common/block/acpi/acpi/globalnvs.asl
index ab63a5c..003a5ce 100644
--- a/src/soc/intel/common/block/acpi/acpi/globalnvs.asl
+++ b/src/soc/intel/common/block/acpi/acpi/globalnvs.asl
@@ -25,4 +25,7 @@
    A4GB,	64,	// 0x30 - 0x37 Base of above 4GB MMIO Resource
    A4GS,	64,	// 0x38 - 0x3f Length of above 4GB MMIO Resource
    ,	64, 	// 0x40 - 0x47 Hest log buffer (used in SMM, not ASL code)
+	EPCS,	8,	// 0x48 - SGX enabled status
+	EMNA,	64,	// 0x49 - 0x50 EPC base address
+	ELNG,	64,	// 0x51 - 0x58 EPC length
 }
diff --git a/src/soc/intel/common/block/include/intelblocks/nvs.h b/src/soc/intel/common/block/include/intelblocks/nvs.h
index 5adbdb8..3ebb08b 100644
--- a/src/soc/intel/common/block/include/intelblocks/nvs.h
+++ b/src/soc/intel/common/block/include/intelblocks/nvs.h
@@ -27,6 +27,10 @@
    u64	a4gb; /* 0x30 - 0x37 Base of above 4GB MMIO Resource */
    u64	a4gs; /* 0x38 - 0x3f Length of above 4GB MMIO Resource */
    u64	hest_log_addr; /* 0x40 - 47 err log addr (used in SMM, not ASL code) */
+	/* SGX */
+	u8	epcs; /* 0x48 - SGX enabled status */
+	u64	emna; /* 0x49 - 0x50 EPC base address */
+	u64	elng; /* 0x51 - 0x58 EPC length */
 };

#endif