From 229fd9e7aa1c5ca9cfac7fcc0d49f0d8534e4c0c Mon Sep 17 00:00:00 2001 From: Michael Kinney Date: Tue, 3 Nov 2015 02:06:57 +0000 Subject: MdeModulePkg: PiSmmCore: Remove confusing CopyMem() of SMM_ENTRY_CONTEXT A subset of fields in the EFI_SMM_SYSTEM_TABLE2 structure are identical to the fields in the SMM_ENTRY_CONTEXT structure. CopyMem() is used to transfer the contents of the SMM_ENTRY_CONTEXT structure into the EFI_SMM_SYSTEM_TABLE2. This is confusing because SMM_ENTRY_CONTEXT is not used in the declaration of EFI_SMM_SYSTEM_TABLE2 and field contents are transferred without any reference to individual field names (e.g. CurrentlyExecutingCpu). In order to make the code easier to maintain and understand, the CopyMem() is replaced with statements that transfer each field of SMM_ENTRY_CONTEXT into EFI_SMM_SYSTEM_TABLE2. Reported-by: Laszlo Ersek Link: http://article.gmane.org/gmane.comp.bios.edk2.devel/3567 Cc: Feng Tian Cc: Jeff Fan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael Kinney Reviewed-by: Feng Tian Reviewed-by: Laszlo Ersek git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18716 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Core/PiSmmCore/PiSmmCore.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'MdeModulePkg/Core') diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c index 496638a17e..cc7ccec248 100644 --- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c +++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c @@ -432,9 +432,13 @@ SmmEntryPoint ( PERF_START (NULL, "SMM", NULL, 0) ; // - // Update SMST using the context + // Update SMST with contents of the SmmEntryContext structure // - CopyMem (&gSmmCoreSmst.SmmStartupThisAp, SmmEntryContext, sizeof (EFI_SMM_ENTRY_CONTEXT)); + gSmmCoreSmst.SmmStartupThisAp = SmmEntryContext->SmmStartupThisAp; + gSmmCoreSmst.CurrentlyExecutingCpu = SmmEntryContext->CurrentlyExecutingCpu; + gSmmCoreSmst.NumberOfCpus = SmmEntryContext->NumberOfCpus; + gSmmCoreSmst.CpuSaveStateSize = SmmEntryContext->CpuSaveStateSize; + gSmmCoreSmst.CpuSaveState = SmmEntryContext->CpuSaveState; // // Call platform hook before Smm Dispatch -- cgit v1.2.3