UefiCpuPkg/CpuMpPei: Remove un-used variables and functions

Cc: Feng Tian <feng.tian@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Giri Mudusuru <giri.p.mudusuru@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Giri P Mudusuru <giri.p.mudusuru@intel.com>

diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.c b/UefiCpuPkg/CpuMpPei/CpuMpPei.c
index 5a1a64888ca74c91c173c32481204d32c98d3121..bfaaa7a6b0c660052f5ce44c47f8e95891607599 100644 (file)
--- a/UefiCpuPkg/CpuMpPei/CpuMpPei.c
+++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.c
@@ -14,30 +14,6 @@
 \r
 #include "CpuMpPei.h"\r
 \r
 \r
 #include "CpuMpPei.h"\r
 \r

-//\r
-// Global Descriptor Table (GDT)\r
-//\r
-GLOBAL_REMOVE_IF_UNREFERENCED IA32_GDT mGdtEntries[] = {\r
-/* selector { Global Segment Descriptor                              } */\r
-/* 0x00 */  {{0,      0,  0,  0,    0,  0,  0,  0,    0,  0, 0,  0,  0}}, //null descriptor\r
-/* 0x08 */  {{0xffff, 0,  0,  0x2,  1,  0,  1,  0xf,  0,  0, 1,  1,  0}}, //linear data segment descriptor\r
-/* 0x10 */  {{0xffff, 0,  0,  0xf,  1,  0,  1,  0xf,  0,  0, 1,  1,  0}}, //linear code segment descriptor\r
-/* 0x18 */  {{0xffff, 0,  0,  0x3,  1,  0,  1,  0xf,  0,  0, 1,  1,  0}}, //system data segment descriptor\r
-/* 0x20 */  {{0xffff, 0,  0,  0xa,  1,  0,  1,  0xf,  0,  0, 1,  1,  0}}, //system code segment descriptor\r
-/* 0x28 */  {{0,      0,  0,  0,    0,  0,  0,  0,    0,  0, 0,  0,  0}}, //spare segment descriptor\r
-/* 0x30 */  {{0xffff, 0,  0,  0x2,  1,  0,  1,  0xf,  0,  0, 1,  1,  0}}, //system data segment descriptor\r
-/* 0x38 */  {{0xffff, 0,  0,  0xa,  1,  0,  1,  0xf,  0,  1, 0,  1,  0}}, //system code segment descriptor\r
-/* 0x40 */  {{0,      0,  0,  0,    0,  0,  0,  0,    0,  0, 0,  0,  0}}, //spare segment descriptor\r
-};\r
-\r
-//\r
-// IA32 Gdt register\r
-//\r
-GLOBAL_REMOVE_IF_UNREFERENCED IA32_DESCRIPTOR mGdt = {\r
-  sizeof (mGdtEntries) - 1,\r
-  (UINTN) mGdtEntries\r
-  };\r
-\r

 GLOBAL_REMOVE_IF_UNREFERENCED EFI_PEI_NOTIFY_DESCRIPTOR mNotifyList = {\r
   (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
   &gEfiEndOfPeiSignalPpiGuid,\r
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_PEI_NOTIFY_DESCRIPTOR mNotifyList = {\r
   (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
   &gEfiEndOfPeiSignalPpiGuid,\r

diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.h b/UefiCpuPkg/CpuMpPei/CpuMpPei.h
index 4c114decb6c66f1e2916a97bb93033400ef2c01f..ef214503656a38ba6bc7aabf127192d08db41ac0 100644 (file)
--- a/UefiCpuPkg/CpuMpPei/CpuMpPei.h
+++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.h
@@ -85,25 +85,6 @@ typedef struct _PEI_CPU_MP_DATA  PEI_CPU_MP_DATA;
 \r
 #pragma pack(1)\r
 \r
 \r
 #pragma pack(1)\r
 \r

-typedef union {\r
-  struct {\r
-    UINT32  LimitLow    : 16;\r
-    UINT32  BaseLow     : 16;\r
-    UINT32  BaseMid     : 8;\r
-    UINT32  Type        : 4;\r
-    UINT32  System      : 1;\r
-    UINT32  Dpl         : 2;\r
-    UINT32  Present     : 1;\r
-    UINT32  LimitHigh   : 4;\r
-    UINT32  Software    : 1;\r
-    UINT32  Reserved    : 1;\r
-    UINT32  DefaultSize : 1;\r
-    UINT32  Granularity : 1;\r
-    UINT32  BaseHigh    : 8;\r
-  } Bits;\r
-  UINT64  Uint64;\r
-} IA32_GDT;\r
-\r

 //\r
 // MP CPU exchange information for AP reset code\r
 // This structure is required to be packed because fixed field offsets\r
 //\r
 // MP CPU exchange information for AP reset code\r
 // This structure is required to be packed because fixed field offsets\r

diff --git a/UefiCpuPkg/CpuMpPei/Ia32/MpEqu.inc b/UefiCpuPkg/CpuMpPei/Ia32/MpEqu.inc
index a88185ed087c9fa9948475f69645e24ac463c816..50111e5023d140149c5dc74f18bbf52afac1cc98 100644 (file)
--- a/UefiCpuPkg/CpuMpPei/Ia32/MpEqu.inc
+++ b/UefiCpuPkg/CpuMpPei/Ia32/MpEqu.inc
@@ -18,9 +18,6 @@
 ;\r
 ;-------------------------------------------------------------------------------\r
 \r
 ;\r
 ;-------------------------------------------------------------------------------\r
 \r

-PROTECT_MODE_CS               equ        10h\r
-PROTECT_MODE_DS               equ        18h\r
-\r

 VacantFlag                    equ        00h\r
 NotVacantFlag                 equ        0ffh\r
 \r
 VacantFlag                    equ        00h\r
 NotVacantFlag                 equ        0ffh\r
 \r

diff --git a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm
index 97fdd9ef97411d40c39b14cd02db2dbc22191847..d0b00887291a5d9a1ada18bcbf4ff8529a92fca8 100644 (file)
--- a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm
+++ b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.asm
@@ -248,31 +248,4 @@ OtherLoaded:
     ret\r
 AsmExchangeRole   ENDP\r
 \r
     ret\r
 AsmExchangeRole   ENDP\r
 \r

-AsmInitializeGdt   PROC  near C  PUBLIC\r
-  push         ebp\r
-  mov          ebp, esp\r
-  pushad\r
-  mov          edi, [ebp + 8]      ; Load GDT register\r
-\r
-  mov          ax,cs               ; Get the selector data from our code image\r
-  mov          es,ax\r
-  lgdt         FWORD PTR es:[edi]  ; and update the GDTR\r
-\r
-  push         PROTECT_MODE_CS\r
-  lea          eax, SetCodeSelectorFarJump\r
-  push         eax\r
-  retf\r
-SetCodeSelectorFarJump:\r
-  mov          ax, PROTECT_MODE_DS ; Update the Base for the new selectors, too\r
-  mov          ds, ax\r
-  mov          es, ax\r
-  mov          fs, ax\r
-  mov          gs, ax\r
-  mov          ss, ax\r
-\r
-  popad\r
-  pop          ebp\r
-  ret\r
-AsmInitializeGdt  ENDP\r
-\r

 END\r
 END\r

diff --git a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm
index 577ca4e31c8f5794a3cb09a103eccab7acf240bf..fc9db873fc1210caa9fdcdb36a04425387c0c4c3 100644 (file)
--- a/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm
+++ b/UefiCpuPkg/CpuMpPei/Ia32/MpFuncs.nasm
@@ -228,28 +228,3 @@ OtherLoaded:
 \r
     popad\r
     ret\r
 \r
     popad\r
     ret\r

-\r
-global ASM_PFX(AsmInitializeGdt)\r
-ASM_PFX(AsmInitializeGdt):\r
-  push         ebp\r
-  mov          ebp, esp\r
-  pushad\r
-  mov          edi, [ebp + 8]      ; Load GDT register\r
-\r
-  lgdt         [edi]      ; and update the GDTR\r
-\r
-  push         PROTECT_MODE_CS\r
-  mov          eax, ASM_PFX(SetCodeSelectorFarJump)\r
-  push         eax\r
-  retf\r
-ASM_PFX(SetCodeSelectorFarJump):\r
-  mov          ax, PROTECT_MODE_DS ; Update the Base for the new selectors, too\r
-  mov          ds, ax\r
-  mov          es, ax\r
-  mov          fs, ax\r
-  mov          gs, ax\r
-  mov          ss, ax\r
-\r
-  popad\r
-  pop          ebp\r
-  ret\r

diff --git a/UefiCpuPkg/CpuMpPei/X64/MpEqu.inc b/UefiCpuPkg/CpuMpPei/X64/MpEqu.inc
index 30c7f6110b6ed62194d82861e3cf3e900078062d..07caf3b99131877dd5329667b168a040994ed531 100644 (file)
--- a/UefiCpuPkg/CpuMpPei/X64/MpEqu.inc
+++ b/UefiCpuPkg/CpuMpPei/X64/MpEqu.inc
@@ -18,11 +18,6 @@
 ;\r
 ;-------------------------------------------------------------------------------\r
 \r
 ;\r
 ;-------------------------------------------------------------------------------\r
 \r

-PROTECT_MODE_CS               equ        10h\r
-PROTECT_MODE_DS               equ        18h\r
-LONG_MODE_CS                  equ        38h\r
-LONG_MODE_DS                  equ        30h\r
-\r

 VacantFlag                    equ        00h\r
 NotVacantFlag                 equ        0ffh\r
 \r
 VacantFlag                    equ        00h\r
 NotVacantFlag                 equ        0ffh\r
 \r

diff --git a/UefiCpuPkg/CpuMpPei/X64/MpFuncs.asm b/UefiCpuPkg/CpuMpPei/X64/MpFuncs.asm
index f018c3bb09a01a1ac171a4ccac68a2d6eb1024c0..03e00924fb0cd0b22c0b73fcb8baf5dcc2807980 100644 (file)
--- a/UefiCpuPkg/CpuMpPei/X64/MpFuncs.asm
+++ b/UefiCpuPkg/CpuMpPei/X64/MpFuncs.asm
@@ -288,30 +288,4 @@ OtherLoaded:
     ret\r
 AsmExchangeRole   ENDP\r
 \r
     ret\r
 AsmExchangeRole   ENDP\r
 \r

-AsmInitializeGdt   PROC\r
-    push       rbp\r
-    mov        rbp, rsp\r
-\r
-    lgdt       fword PTR [rcx]  ; update the GDTR\r
-\r
-    sub        rsp, 0x10\r
-    lea        rax, SetCodeSelectorFarJump\r
-    mov        [rsp], rax\r
-    mov        rdx, LONG_MODE_CS\r
-    mov        [rsp + 4], dx    ; get new CS\r
-    jmp        fword ptr [rsp]\r
-SetCodeSelectorFarJump:\r
-    add        rsp, 0x10\r
-\r
-    mov        rax, LONG_MODE_DS          ; get new DS\r
-    mov        ds, ax\r
-    mov        es, ax\r
-    mov        fs, ax\r
-    mov        gs, ax\r
-    mov        ss, ax\r
-\r
-    pop        rbp\r
-    ret\r
-AsmInitializeGdt  ENDP\r
-\r

 END\r
 END\r

diff --git a/UefiCpuPkg/CpuMpPei/X64/MpFuncs.nasm b/UefiCpuPkg/CpuMpPei/X64/MpFuncs.nasm
index 99cbee296b7d969564070169468e1b387ba10051..e0a98647dff027360d701cdf87859f4b3569c8f5 100644 (file)
--- a/UefiCpuPkg/CpuMpPei/X64/MpFuncs.nasm
+++ b/UefiCpuPkg/CpuMpPei/X64/MpFuncs.nasm
@@ -280,30 +280,3 @@ OtherLoaded:
     pop        rax\r
 \r
     ret\r
     pop        rax\r
 \r
     ret\r

-\r
-global ASM_PFX(AsmInitializeGdt)\r
-ASM_PFX(AsmInitializeGdt):\r
-    push       rbp\r
-    mov        rbp, rsp\r
-\r
-    lgdt       [rcx]  ; update the GDTR\r
-\r
-    sub        rsp, 0x10\r
-    mov        rax, ASM_PFX(SetCodeSelectorFarJump)\r
-    mov        [rsp], rax\r
-    mov        rdx, LONG_MODE_CS\r
-    mov        [rsp + 4], dx    ; get new CS\r
-    jmp        far dword [rsp]  ; far jump with new CS\r
-ASM_PFX(SetCodeSelectorFarJump):\r
-    add        rsp, 0x10\r
-\r
-    mov        rax, LONG_MODE_DS          ; get new DS\r
-    mov        ds, ax\r
-    mov        es, ax\r
-    mov        fs, ax\r
-    mov        gs, ax\r
-    mov        ss, ax\r
-\r
-    pop        rbp\r
-\r
-  ret\r