From 6f9b1a904923cab9905bd6521738e7b6617cf3c5 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Mon, 15 Feb 2021 16:40:51 +0100 Subject: [PATCH] cpu/x86/smm.h: Remove smm runtime pointer from smm_loader_params struct smm_loader_params is a struct that is passed around in the ramstage code to set up either the relocation handler or the permanent handler. At the moment no parameters in the stub 'smm_runtime' are referenced so it can be dropped. The purpose is to drop the smm_runtime struct from the stub as it is already located in the permanent handler. Change-Id: I09c1b649b5991f55b5ccf57f22e4a3ad4c9e4f03 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/50766 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/cpu/x86/smm/smm_module_loader.c | 1 - src/cpu/x86/smm/smm_module_loaderv2.c | 1 - src/include/cpu/x86/smm.h | 1 - 3 files changed, 3 deletions(-) diff --git a/src/cpu/x86/smm/smm_module_loader.c b/src/cpu/x86/smm/smm_module_loader.c index 087cf1a760..028ace27eb 100644 --- a/src/cpu/x86/smm/smm_module_loader.c +++ b/src/cpu/x86/smm/smm_module_loader.c @@ -263,7 +263,6 @@ static int smm_module_setup_stub(void *smbase, size_t smm_size, /* Allow the initiator to manipulate SMM stub parameters. */ params->stub_params = stub_params; - params->runtime = &stub_params->runtime; printk(BIOS_DEBUG, "SMM Module: stub loaded at %p. Will call %p\n", smm_stub_loc, params->handler); diff --git a/src/cpu/x86/smm/smm_module_loaderv2.c b/src/cpu/x86/smm/smm_module_loaderv2.c index 2f4e88e6f6..afed05f9bd 100644 --- a/src/cpu/x86/smm/smm_module_loaderv2.c +++ b/src/cpu/x86/smm/smm_module_loaderv2.c @@ -468,7 +468,6 @@ static int smm_module_setup_stub(void *smbase, size_t smm_size, /* Allow the initiator to manipulate SMM stub parameters. */ params->stub_params = stub_params; - params->runtime = &stub_params->runtime; printk(BIOS_DEBUG, "SMM Module: stub loaded at %p. Will call %p\n", smm_stub_loc, params->handler); diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h index 25ce144cbb..8b92e417e8 100644 --- a/src/include/cpu/x86/smm.h +++ b/src/include/cpu/x86/smm.h @@ -151,7 +151,6 @@ struct smm_loader_params { smm_handler_t handler; struct smm_stub_params *stub_params; - struct smm_runtime *runtime; /* The following are only used by X86_SMM_LOADER_VERSION2 */ #if CONFIG(X86_SMM_LOADER_VERSION2)