3dfd64305b
There are below 2 differences between AMD & OVMF according
existing implementation:
1.The mode of the CPU check is different between the AMD & OVMF.
OVMF:
CpuSaveState->x86.SMMRevId & 0Xffff
AMD:
LMAValue = (UINT32)AsmReadMsr64 (EFER_ADDRESS) & LMA
2.Existing SmBase configuration is different between the
AMD & OVMF.
OVMF:
if ((CpuSaveState->x86.SMMRevId & 0xFFFF) == 0) {
CpuSaveState->x86.SMBASE = mSmBaseForAllCpus[CpuIndex];
} else {
CpuSaveState->x64.SMBASE = mSmBaseForAllCpus[CpuIndex];
}
AMD:
AmdCpuState->x64.SMBASE = mSmBaseForAllCpus[CpuIndex];
This patch provides the SmmRelocationLib library instance
for OVMF to handle the logic difference, and it won't change
the existing implementation code logic.
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zeng Star <star.zeng@intel.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>
67 lines
1.9 KiB
C
67 lines
1.9 KiB
C
/** @file
|
|
Semaphore mechanism to indicate to the BSP that an AP has exited SMM
|
|
after SMBASE relocation.
|
|
|
|
Copyright (c) 2024, Intel Corporation. All rights reserved.<BR>
|
|
SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
|
|
**/
|
|
|
|
#include "InternalSmmRelocationLib.h"
|
|
|
|
X86_ASSEMBLY_PATCH_LABEL gPatchSmmRelocationOriginalAddressPtr32;
|
|
X86_ASSEMBLY_PATCH_LABEL gPatchRebasedFlagAddr32;
|
|
|
|
UINTN mSmmRelocationOriginalAddress;
|
|
volatile BOOLEAN *mRebasedFlag;
|
|
|
|
/**
|
|
AP Semaphore operation in 32-bit mode while BSP runs in 64-bit mode.
|
|
**/
|
|
VOID
|
|
SmmRelocationSemaphoreComplete32 (
|
|
VOID
|
|
);
|
|
|
|
/**
|
|
Hook return address of SMM Save State so that semaphore code
|
|
can be executed immediately after AP exits SMM to indicate to
|
|
the BSP that an AP has exited SMM after SMBASE relocation.
|
|
|
|
@param[in] RebasedFlag A pointer to a flag that is set to TRUE
|
|
immediately after AP exits SMM.
|
|
|
|
**/
|
|
VOID
|
|
SemaphoreHook (
|
|
IN volatile BOOLEAN *RebasedFlag
|
|
)
|
|
{
|
|
SMRAM_SAVE_STATE_MAP *CpuState;
|
|
UINTN TempValue;
|
|
|
|
mRebasedFlag = RebasedFlag;
|
|
PatchInstructionX86 (
|
|
gPatchRebasedFlagAddr32,
|
|
(UINT32)(UINTN)mRebasedFlag,
|
|
4
|
|
);
|
|
|
|
CpuState = (SMRAM_SAVE_STATE_MAP *)(UINTN)(SMM_DEFAULT_SMBASE + SMRAM_SAVE_STATE_MAP_OFFSET);
|
|
mSmmRelocationOriginalAddress = HookReturnFromSmm (
|
|
CpuState,
|
|
(UINT64)(UINTN)&SmmRelocationSemaphoreComplete32,
|
|
(UINT64)(UINTN)&SmmRelocationSemaphoreComplete
|
|
);
|
|
|
|
//
|
|
// Use temp value to fix ICC compiler warning
|
|
//
|
|
TempValue = (UINTN)&mSmmRelocationOriginalAddress;
|
|
PatchInstructionX86 (
|
|
gPatchSmmRelocationOriginalAddressPtr32,
|
|
(UINT32)TempValue,
|
|
4
|
|
);
|
|
}
|