Contributed-under: TianoCore Contribution Agreement 1.0
Cc: Feng Tian <feng.t...@intel.com>
Cc: Michael Kinney <michael.d.kin...@intel.com>
Cc: Jordan Justen <jordan.l.jus...@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff....@intel.com>
Tested-by: Michael Kinney <michael.d.kin...@intel.com>
---
 UefiCpuPkg/CpuMpPei/CpuMpPei.h        | 10 ----------
 UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm  |  6 ------
 UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm |  6 ------
 UefiCpuPkg/CpuMpPei/X64/MpFuncs.asm   |  6 ------
 UefiCpuPkg/CpuMpPei/X64/MpFuncs.nasm  |  6 ------
 5 files changed, 34 deletions(-)

diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.h b/UefiCpuPkg/CpuMpPei/CpuMpPei.h
index 65d8d48..d2bd291 100644
--- a/UefiCpuPkg/CpuMpPei/CpuMpPei.h
+++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.h
@@ -197,16 +197,6 @@ AsmInitializeGdt (
   );
 
 /**
-  Assembly code to do CLI-HALT loop.
-
-**/
-VOID
-EFIAPI
-AsmCliHltLoop (
-  VOID
-  );
-
-/**
   Get available system memory below 1MB by specified size.
 
   @param PeiCpuMpData        Pointer to PEI CPU MP Data
diff --git a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm 
b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm
index eb23a16..ab78bcc 100644
--- a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm
+++ b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm
@@ -144,12 +144,6 @@ 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 5d2da82..2ff16dc 100644
--- a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm
+++ b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm
@@ -132,12 +132,6 @@ 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 fad5e8d..1bb3b6d 100644
--- a/UefiCpuPkg/CpuMpPei/X64/MpFuncs.asm
+++ b/UefiCpuPkg/CpuMpPei/X64/MpFuncs.asm
@@ -181,12 +181,6 @@ 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 0b2e879..00e5f58 100644
--- a/UefiCpuPkg/CpuMpPei/X64/MpFuncs.nasm
+++ b/UefiCpuPkg/CpuMpPei/X64/MpFuncs.nasm
@@ -175,12 +175,6 @@ CProcedureInvoke:
 
 RendezvousFunnelProcEnd:
 
-global ASM_PFX(AsmCliHltLoop)
-ASM_PFX(AsmCliHltLoop):
-    cli
-    hlt
-    jmp $-2
-
 
;-------------------------------------------------------------------------------------
 ;  AsmGetAddressMap (&AddressMap);
 
;-------------------------------------------------------------------------------------
-- 
1.9.5.msysgit.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to