diff options
| author | Jeff Fan <jeff.fan@intel.com> | 2015-07-15 03:45:45 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@Edk2> | 2015-07-15 03:45:45 +0000 |
| commit | fcc82734bff62c2727a7705afb952f148cabef85 (patch) | |
| tree | 45ac0bf7e249ecefd4b7361b2e4fb7d71a972469 /UefiCpuPkg | |
| parent | e35d034736404dca9240bfe9bd575ea8265461a6 (diff) | |
| download | edk2-fcc82734bff62c2727a7705afb952f148cabef85.zip edk2-fcc82734bff62c2727a7705afb952f148cabef85.tar.gz edk2-fcc82734bff62c2727a7705afb952f148cabef85.tar.bz2 | |
UefiCpuPkg/CpuMpPei: Add AsmHltLoop ()
Add AsmHltLoop () in assembly code, it will not be copied into AP wakeup
buffer and invoked at end of ApCFunction (). To make sure AP work in case
AP wakeup buffer is restored to original data.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18013 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'UefiCpuPkg')
| -rw-r--r-- | UefiCpuPkg/CpuMpPei/CpuMpPei.c | 1 | ||||
| -rw-r--r-- | UefiCpuPkg/CpuMpPei/CpuMpPei.h | 9 | ||||
| -rw-r--r-- | UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm | 6 | ||||
| -rw-r--r-- | UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm | 6 | ||||
| -rw-r--r-- | UefiCpuPkg/CpuMpPei/X64/MpFuncs.asm | 6 | ||||
| -rw-r--r-- | UefiCpuPkg/CpuMpPei/X64/MpFuncs.nasm | 6 |
6 files changed, 34 insertions, 0 deletions
diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.c b/UefiCpuPkg/CpuMpPei/CpuMpPei.c index 7b75d35..40e62e0 100644 --- a/UefiCpuPkg/CpuMpPei/CpuMpPei.c +++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.c @@ -169,6 +169,7 @@ ApCFunction ( // InterlockedIncrement ((UINT32 *)&PeiCpuMpData->FinishedCount); + AsmCliHltLoop (); } /** diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.h b/UefiCpuPkg/CpuMpPei/CpuMpPei.h index 97d52bf..c241349 100644 --- a/UefiCpuPkg/CpuMpPei/CpuMpPei.h +++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.h @@ -166,6 +166,15 @@ AsmInitializeGdt ( IN IA32_DESCRIPTOR *Gdtr ); +/** + Assembly code to do CLI-HALT loop. + +**/ +VOID +EFIAPI +AsmCliHltLoop ( + VOID + ); /** This function will be called by BSP to wakeup AP. diff --git a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm index 63c8048..060f467 100644 --- a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm +++ b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm @@ -144,6 +144,12 @@ CProcedureInvoke: RendezvousFunnelProc ENDP RendezvousFunnelProcEnd:: +AsmCliHltLoop PROC near C PUBLIC + cli + hlt + jmp $-2 +AsmCliHltLoop ENDP + ;------------------------------------------------------------------------------------- ; AsmGetAddressMap (&AddressMap); ;------------------------------------------------------------------------------------- diff --git a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm index fe45cf1..3a8e91f 100644 --- a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm +++ b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm @@ -132,6 +132,12 @@ CProcedureInvoke: jmp $ ; never reach here RendezvousFunnelProcEnd: +global ASM_PFX(AsmCliHltLoop) +ASM_PFX(AsmCliHltLoop): + cli + hlt + jmp $-2 + ;------------------------------------------------------------------------------------- ; AsmGetAddressMap (&AddressMap); ;------------------------------------------------------------------------------------- diff --git a/UefiCpuPkg/CpuMpPei/X64/MpFuncs.asm b/UefiCpuPkg/CpuMpPei/X64/MpFuncs.asm index 6622c43..18c8b72 100644 --- a/UefiCpuPkg/CpuMpPei/X64/MpFuncs.asm +++ b/UefiCpuPkg/CpuMpPei/X64/MpFuncs.asm @@ -181,6 +181,12 @@ CProcedureInvoke: RendezvousFunnelProc ENDP RendezvousFunnelProcEnd:: +AsmCliHltLoop PROC + cli + hlt + jmp $-2 +AsmCliHltLoop ENDP + ;------------------------------------------------------------------------------------- ; AsmGetAddressMap (&AddressMap); ;------------------------------------------------------------------------------------- diff --git a/UefiCpuPkg/CpuMpPei/X64/MpFuncs.nasm b/UefiCpuPkg/CpuMpPei/X64/MpFuncs.nasm index 8b93c0d..4683543 100644 --- a/UefiCpuPkg/CpuMpPei/X64/MpFuncs.nasm +++ b/UefiCpuPkg/CpuMpPei/X64/MpFuncs.nasm @@ -175,6 +175,12 @@ CProcedureInvoke: RendezvousFunnelProcEnd: +global ASM_PFX(AsmCliHltLoop) +ASM_PFX(AsmCliHltLoop): + cli + hlt + jmp $-2 + ;------------------------------------------------------------------------------------- ; AsmGetAddressMap (&AddressMap); ;------------------------------------------------------------------------------------- |