[coreboot-gerrit] Change in coreboot[master]: ACPI: Add and fill gnvs_ptr for smm_runtime

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42464 )

Change subject: ACPI: Add and fill gnvs_ptr for smm_runtime
......................................................................

ACPI: Add and fill gnvs_ptr for smm_runtime

Change-Id: I823d04a4851437b4267a60886e5ab205bb2e1b10
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42464
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
Reviewed-by: Aaron Durbin 
Reviewed-by: Furquan Shaikh 
---
M src/cpu/x86/smm/smm_module_loader.c
M src/cpu/x86/smm/smm_stub.S
M src/include/cpu/x86/smm.h
3 files changed, 5 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Aaron Durbin: Looks good to me, approved
  Furquan Shaikh: Looks good to me, approved
  Angel Pons: Looks good to me, but someone else must approve

diff --git a/src/cpu/x86/smm/smm_module_loader.c b/src/cpu/x86/smm/smm_module_loader.c
index 6e9781a..fc1e1b3 100644
--- a/src/cpu/x86/smm/smm_module_loader.c
+++ b/src/cpu/x86/smm/smm_module_loader.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

#include <string.h>
+#include <acpi/acpi_gnvs.h>
 #include <rmodule.h>
 #include <cpu/x86/smm.h>
 #include <commonlib/helpers.h>
@@ -261,6 +262,7 @@
    stub_params->runtime.smm_size = smm_size;
    stub_params->runtime.save_state_size = params->per_cpu_save_state_size;
    stub_params->runtime.num_cpus = params->num_concurrent_stacks;
+	stub_params->runtime.gnvs_ptr = (uintptr_t)acpi_get_gnvs();

/* Initialize the APIC id to CPU number table to be 1:1 */
    for (i = 0; i < params->num_concurrent_stacks; i++)
diff --git a/src/cpu/x86/smm/smm_stub.S b/src/cpu/x86/smm/smm_stub.S
index 8086b75..425724d 100644
--- a/src/cpu/x86/smm/smm_stub.S
+++ b/src/cpu/x86/smm/smm_stub.S
@@ -36,6 +36,8 @@
 .long 0
 num_cpus:
 .long 0
+gnvs_ptr:
+.long 0
 /* allows the STM to bring up SMM in 32-bit mode */
 start32_offset:
 .long smm_trampoline32 - _start
diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h
index 6671a51..a3101e5 100644
--- a/src/include/cpu/x86/smm.h
+++ b/src/include/cpu/x86/smm.h
@@ -61,6 +61,7 @@
    u32 smm_size;
    u32 save_state_size;
    u32 num_cpus;
+	u32 gnvs_ptr;
    /* STM's 32bit entry into SMI handler */
    u32 start32_offset;
    /* The apic_id_to_cpu provides a mapping from APIC id to CPU number.