Sync patches r13935, r13948, r13952, r13980, r13981 and r14062 from main trunk.

1. Allocate ReservedMemory instead of ACPIMemoryNVS for its shadow memory space which is not required to be restored by OS.
2. Use IA32_IDT_GATE_DESCRIPTOR defined in BaseLib instead of local struct INTERRUPT_GATE_DESCRIPTOR.
3. Just reserve memory space for page table, but not create it, and allocate the memory with ReservedMemory instead of ACPIMemoryNVS.
4. ACPI4.0/5.0 have clear description:
FIRMWARE_CTRL: If the X_FIRMWARE_CTRL field contains a non zero value then this field must be zero.
X_FIRMWARE_CTRL: This field is used when the physical address of the FACS is above 4GB. If the FIRMWARE_CTRL field contains a non zero value then this field must be zero.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010.SR1@14231 6f19259b-4bc3-4df7-8a09-765794883524

11 files changed, 275 insertions, 311 deletions

diff --git a/EdkCompatibilityPkg/Compatibility/BootScriptSaveOnS3SaveStateThunk/ScriptSave.c b/EdkCompatibilityPkg/Compatibility/BootScriptSaveOnS3SaveStateThunk/ScriptSave.c
index eb8de8c..77dccc5 100644
--- a/EdkCompatibilityPkg/Compatibility/BootScriptSaveOnS3SaveStateThunk/ScriptSave.c
+++ b/EdkCompatibilityPkg/Compatibility/BootScriptSaveOnS3SaveStateThunk/ScriptSave.c
@@ -827,7 +827,7 @@ InitializeScriptSaveOnS3SaveState (
   Status = gBS->LocateProtocol (&gEfiCallerIdGuid, NULL, &DevicePath);

   if (EFI_ERROR (Status)) {

     //

-    // This is the first-time loaded by DXE core. reload itself to NVS mem

+    // This is the first-time loaded by DXE core. reload itself to RESERVED mem

     //

     //

     // A workarouond: Here we install a dummy handle

@@ -861,7 +861,7 @@ InitializeScriptSaveOnS3SaveState (
     PageNumber    = EFI_SIZE_TO_PAGES (BufferSize + ImageContext.SectionAlignment);

     Status  = gBS->AllocatePages (

                      AllocateMaxAddress,

-                     EfiACPIMemoryNVS,

+                     EfiReservedMemoryType,

                      PageNumber,

                      &MemoryAddress

                      );

@@ -923,7 +923,7 @@ InitializeScriptSaveOnS3SaveState (
     return EFI_SUCCESS;

   } else {

     //

-    // the entry point is invoked after reloading. following code only run in  ACPI NVS

+    // the entry point is invoked after reloading. following code only run in RESERVED mem

     //

 

     //

diff --git a/EdkCompatibilityPkg/Compatibility/BootScriptThunkHelper/BootScriptThunkHelper.c b/EdkCompatibilityPkg/Compatibility/BootScriptThunkHelper/BootScriptThunkHelper.c
index f20555d..5141df8 100644
--- a/EdkCompatibilityPkg/Compatibility/BootScriptThunkHelper/BootScriptThunkHelper.c
+++ b/EdkCompatibilityPkg/Compatibility/BootScriptThunkHelper/BootScriptThunkHelper.c
@@ -1,9 +1,9 @@
 /** @file

   Boot Script Helper SMM driver.

 

-  This driver is responsible to restoer BootScriptThunk from SMRAM to AcpiNvs for security considertion.

+  This driver is responsible to store BootScriptThunk from ReservedMemory to SMRAM for security consideration.

 

-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>

 

 This program and the accompanying materials

 are licensed and made available under the terms and conditions

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index 0d56c71..03e9e72 100644
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -197,7 +197,7 @@
   ## The value should be a multiple of 4KB.

   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdEbdaReservedMemorySize|0x8000|UINT32|0x30000005

 

-  ## The PCD is used to specify memory size with page number for a pre-allocated ACPI NVS memory to be used

+  ## The PCD is used to specify memory size with page number for a pre-allocated reserved memory to be used

   #  by PEI in S3 phase. The default size 32K. When changing the value of this PCD, the platform

   #  developer should make sure the memory size is large enough to meet PEI requiremnt in S3 phase.

   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize|0x8000|UINT32|0x30000006

diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
index 4e36c8a..85bd589 100644
--- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
+++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.c
@@ -2,7 +2,7 @@
   This is an implementation of the ACPI S3 Save protocol.  This is defined in

   S3 boot path specification 0.9.

 

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>

 

 This program and the accompanying materials

 are licensed and made available under the terms and conditions

@@ -62,18 +62,20 @@ EFI_GUID              mAcpiS3IdtrProfileGuid = {
 };

 

 /**

-  Allocate EfiACPIMemoryNVS below 4G memory address.

+  Allocate memory below 4G memory address.

 

-  This function allocates EfiACPIMemoryNVS below 4G memory address.

+  This function allocates memory below 4G memory address.

 

+  @param  MemoryType   Memory type of memory to allocate.

   @param  Size         Size of memory to allocate.

   

   @return Allocated address for output.

 

 **/

 VOID*

-AllocateAcpiNvsMemoryBelow4G (

-  IN   UINTN   Size

+AllocateMemoryBelow4G (

+  IN EFI_MEMORY_TYPE    MemoryType,

+  IN UINTN              Size

   )

 {

   UINTN                 Pages;

@@ -86,7 +88,7 @@ AllocateAcpiNvsMemoryBelow4G (
 

   Status  = gBS->AllocatePages (

                    AllocateMaxAddress,

-                   EfiACPIMemoryNVS,

+                   MemoryType,

                    Pages,

                    &Address

                    );

@@ -99,6 +101,116 @@ AllocateAcpiNvsMemoryBelow4G (
 }

 

 /**

+

+  This function scan ACPI table in RSDT.

+

+  @param Rsdt      ACPI RSDT

+  @param Signature ACPI table signature

+

+  @return ACPI table

+

+**/

+VOID *

+ScanTableInRSDT (

+  IN EFI_ACPI_DESCRIPTION_HEADER    *Rsdt,

+  IN UINT32                         Signature

+  )

+{

+  UINTN                              Index;

+  UINT32                             EntryCount;

+  UINT32                             *EntryPtr;

+  EFI_ACPI_DESCRIPTION_HEADER        *Table;

+

+  if (Rsdt == NULL) {

+    return NULL;

+  }

+

+  EntryCount = (Rsdt->Length - sizeof (EFI_ACPI_DESCRIPTION_HEADER)) / sizeof(UINT32);

+  

+  EntryPtr = (UINT32 *)(Rsdt + 1);

+  for (Index = 0; Index < EntryCount; Index ++, EntryPtr ++) {

+    Table = (EFI_ACPI_DESCRIPTION_HEADER *)((UINTN)(*EntryPtr));

+    if (Table->Signature == Signature) {

+      return Table;

+    }

+  }

+  

+  return NULL;

+}

+

+/**

+

+  This function scan ACPI table in XSDT.

+

+  @param Xsdt      ACPI XSDT

+  @param Signature ACPI table signature

+

+  @return ACPI table

+

+**/

+VOID *

+ScanTableInXSDT (

+  IN EFI_ACPI_DESCRIPTION_HEADER    *Xsdt,

+  IN UINT32                         Signature

+  )

+{

+  UINTN                          Index;

+  UINT32                         EntryCount;

+  UINT64                         EntryPtr;

+  UINTN                          BasePtr;

+  EFI_ACPI_DESCRIPTION_HEADER    *Table;

+

+  if (Xsdt == NULL) {

+    return NULL;

+  }

+

+  EntryCount = (Xsdt->Length - sizeof (EFI_ACPI_DESCRIPTION_HEADER)) / sizeof(UINT64);

+  

+  BasePtr = (UINTN)(Xsdt + 1);

+  for (Index = 0; Index < EntryCount; Index ++) {

+    CopyMem (&EntryPtr, (VOID *)(BasePtr + Index * sizeof(UINT64)), sizeof(UINT64));

+    Table = (EFI_ACPI_DESCRIPTION_HEADER *)((UINTN)(EntryPtr));

+    if (Table->Signature == Signature) {

+      return Table;

+    }

+  }

+  

+  return NULL;

+}

+

+/**

+  To find Facs in FADT.

+

+  @param Fadt   FADT table pointer

+  

+  @return  Facs table pointer.

+**/

+EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE  *

+FindAcpiFacsFromFadt (

+  IN EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE     *Fadt

+  )

+{

+  EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE  *Facs;

+  UINT64                                        Data64;

+

+  if (Fadt == NULL) {

+    return NULL;

+  }

+

+  if (Fadt->Header.Revision < EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION) {

+    Facs = (EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN)Fadt->FirmwareCtrl;

+  } else {

+    if (Fadt->FirmwareCtrl != 0) {

+      Facs = (EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN)Fadt->FirmwareCtrl;

+    } else {

+      CopyMem (&Data64, &Fadt->XFirmwareCtrl, sizeof(UINT64));

+      Facs = (EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN)Data64;

+    }

+  }

+  return Facs;

+}

+

+/**

   To find Facs in Acpi tables.

  

   To find Firmware ACPI control strutcure in Acpi Tables since the S3 waking vector is stored 

@@ -115,13 +227,12 @@ FindAcpiFacsTableByAcpiGuid (
 {

   EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER  *Rsdp;

   EFI_ACPI_DESCRIPTION_HEADER                   *Rsdt;

+  EFI_ACPI_DESCRIPTION_HEADER                   *Xsdt;

   EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE     *Fadt;

   EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE  *Facs;

   UINTN                                         Index;

-  UINT32                                        Data32;

+

   Rsdp  = NULL;

-  Rsdt  = NULL;

-  Fadt  = NULL;

   //

   // found ACPI table RSD_PTR from system table

   //

@@ -139,27 +250,33 @@ FindAcpiFacsTableByAcpiGuid (
     return NULL;

   }

 

-  Rsdt = (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN) Rsdp->RsdtAddress;

-  if (Rsdt == NULL || Rsdt->Signature != EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE) {

-    return NULL;

-  }

-

-  for (Index = sizeof (EFI_ACPI_DESCRIPTION_HEADER); Index < Rsdt->Length; Index = Index + sizeof (UINT32)) {

-

-    Data32  = *(UINT32 *) ((UINT8 *) Rsdt + Index);

-    Fadt    = (EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE *) (UINT32 *) (UINTN) Data32;

-    if (Fadt->Header.Signature == EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE) {

-      break;

+  //

+  // Search XSDT

+  //

+  if (Rsdp->Revision >= EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION) {

+    Xsdt = (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN) Rsdp->XsdtAddress;

+    Fadt = ScanTableInXSDT (Xsdt, EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE);

+    if (Fadt != NULL) {

+      Facs = FindAcpiFacsFromFadt (Fadt);

+      if (Facs != NULL) {

+        return Facs;

+      }

     }

   }

 

-  if (Fadt == NULL || Fadt->Header.Signature != EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE) {

-    return NULL;

+  //

+  // Search RSDT

+  //

+  Rsdt = (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN) Rsdp->RsdtAddress;

+  Fadt = ScanTableInRSDT (Rsdt, EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE);

+  if (Fadt != NULL) {

+    Facs = FindAcpiFacsFromFadt (Fadt);

+    if (Facs != NULL) {

+      return Facs;

+    }

   }

 

-  Facs = (EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN)Fadt->FirmwareCtrl;

-

-  return Facs;

+  return NULL;

 }

 

 /**

@@ -204,21 +321,12 @@ S3CreateIdentityMappingPageTables (
     UINT32                                        RegEax;

     UINT32                                        RegEdx;

     UINT8                                         PhysicalAddressBits;

-    EFI_PHYSICAL_ADDRESS                          PageAddress;

-    UINTN                                         IndexOfPml4Entries;

-    UINTN                                         IndexOfPdpEntries;

-    UINTN                                         IndexOfPageDirectoryEntries;

     UINT32                                        NumberOfPml4EntriesNeeded;

     UINT32                                        NumberOfPdpEntriesNeeded;

-    PAGE_MAP_AND_DIRECTORY_POINTER                *PageMapLevel4Entry;

-    PAGE_MAP_AND_DIRECTORY_POINTER                *PageMap;

-    PAGE_MAP_AND_DIRECTORY_POINTER                *PageDirectoryPointerEntry;

-    PAGE_TABLE_ENTRY                              *PageDirectoryEntry;

     EFI_PHYSICAL_ADDRESS                          S3NvsPageTableAddress;

     UINTN                                         TotalPageTableSize;

     VOID                                          *Hob;

     BOOLEAN                                       Page1GSupport;

-    PAGE_TABLE_1G_ENTRY                           *PageDirectory1GEntry;

 

     Page1GSupport = FALSE;

     if (PcdGetBool(PcdUse1GPageTable)) {

@@ -277,70 +385,11 @@ S3CreateIdentityMappingPageTables (
     DEBUG ((EFI_D_ERROR, "TotalPageTableSize - %x pages\n", TotalPageTableSize));

 

     //

-    // By architecture only one PageMapLevel4 exists - so lets allocate storgage for it.

+    // By architecture only one PageMapLevel4 exists - so lets allocate storage for it.

     //

-    S3NvsPageTableAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateAcpiNvsMemoryBelow4G (EFI_PAGES_TO_SIZE(TotalPageTableSize));

+    S3NvsPageTableAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateMemoryBelow4G (EfiReservedMemoryType, EFI_PAGES_TO_SIZE(TotalPageTableSize));

     ASSERT (S3NvsPageTableAddress != 0);

-    PageMap = (PAGE_MAP_AND_DIRECTORY_POINTER *)(UINTN)S3NvsPageTableAddress;

-    S3NvsPageTableAddress += SIZE_4KB;

-

-    PageMapLevel4Entry = PageMap;

-    PageAddress        = 0;

-    for (IndexOfPml4Entries = 0; IndexOfPml4Entries < NumberOfPml4EntriesNeeded; IndexOfPml4Entries++, PageMapLevel4Entry++) {

-      //

-      // Each PML4 entry points to a page of Page Directory Pointer entires.

-      // So lets allocate space for them and fill them in in the IndexOfPdpEntries loop.

-      //

-      PageDirectoryPointerEntry = (PAGE_MAP_AND_DIRECTORY_POINTER *)(UINTN)S3NvsPageTableAddress;

-      S3NvsPageTableAddress += SIZE_4KB;

-      //

-      // Make a PML4 Entry

-      //

-      PageMapLevel4Entry->Uint64 = (UINT64)(UINTN)PageDirectoryPointerEntry;

-      PageMapLevel4Entry->Bits.ReadWrite = 1;

-      PageMapLevel4Entry->Bits.Present = 1;

-    

-      if (Page1GSupport) {

-        PageDirectory1GEntry = (PAGE_TABLE_1G_ENTRY *)(UINTN)PageDirectoryPointerEntry;

-    

-        for (IndexOfPageDirectoryEntries = 0; IndexOfPageDirectoryEntries < 512; IndexOfPageDirectoryEntries++, PageDirectory1GEntry++, PageAddress += SIZE_1GB) {

-          //

-          // Fill in the Page Directory entries

-          //

-          PageDirectory1GEntry->Uint64 = (UINT64)PageAddress;

-          PageDirectory1GEntry->Bits.ReadWrite = 1;

-          PageDirectory1GEntry->Bits.Present = 1;

-          PageDirectory1GEntry->Bits.MustBe1 = 1;

-        }

-      } else {

-        for (IndexOfPdpEntries = 0; IndexOfPdpEntries < NumberOfPdpEntriesNeeded; IndexOfPdpEntries++, PageDirectoryPointerEntry++) {

-          //

-          // Each Directory Pointer entries points to a page of Page Directory entires.

-          // So allocate space for them and fill them in in the IndexOfPageDirectoryEntries loop.

-          //       

-          PageDirectoryEntry = (PAGE_TABLE_ENTRY *)(UINTN)S3NvsPageTableAddress;

-          S3NvsPageTableAddress += SIZE_4KB;

-      

-          //

-          // Fill in a Page Directory Pointer Entries

-          //

-          PageDirectoryPointerEntry->Uint64 = (UINT64)(UINTN)PageDirectoryEntry;

-          PageDirectoryPointerEntry->Bits.ReadWrite = 1;

-          PageDirectoryPointerEntry->Bits.Present = 1;

-      

-          for (IndexOfPageDirectoryEntries = 0; IndexOfPageDirectoryEntries < 512; IndexOfPageDirectoryEntries++, PageDirectoryEntry++, PageAddress += SIZE_2MB) {

-            //

-            // Fill in the Page Directory entries

-            //

-            PageDirectoryEntry->Uint64 = (UINT64)PageAddress;

-            PageDirectoryEntry->Bits.ReadWrite = 1;

-            PageDirectoryEntry->Bits.Present = 1;

-            PageDirectoryEntry->Bits.MustBe1 = 1;

-          }

-        }

-      }

-    }

-    return (EFI_PHYSICAL_ADDRESS) (UINTN) PageMap;

+    return S3NvsPageTableAddress;

   } else {

     //

     // If DXE is running 32-bit mode, no need to establish page table.

@@ -414,7 +463,7 @@ S3Ready (
   }

   AlreadyEntered = TRUE;

 

-  AcpiS3Context = AllocateAcpiNvsMemoryBelow4G (sizeof(*AcpiS3Context));

+  AcpiS3Context = AllocateMemoryBelow4G (EfiReservedMemoryType, sizeof(*AcpiS3Context));

   ASSERT (AcpiS3Context != NULL);

   AcpiS3ContextBuffer = (EFI_PHYSICAL_ADDRESS)(UINTN)AcpiS3Context;

 

@@ -424,7 +473,7 @@ S3Ready (
   AcpiS3Context->AcpiFacsTable = (EFI_PHYSICAL_ADDRESS)(UINTN)FindAcpiFacsTable ();

   ASSERT (AcpiS3Context->AcpiFacsTable != 0);

 

-  IdtGate = AllocateAcpiNvsMemoryBelow4G (sizeof(IA32_IDT_GATE_DESCRIPTOR) * 0x100 + sizeof(IA32_DESCRIPTOR));

+  IdtGate = AllocateMemoryBelow4G (EfiReservedMemoryType, sizeof(IA32_IDT_GATE_DESCRIPTOR) * 0x100 + sizeof(IA32_DESCRIPTOR));

   Idtr = (IA32_DESCRIPTOR *)(IdtGate + 0x100);

   Idtr->Base  = (UINTN)IdtGate;

   Idtr->Limit = (UINT16)(sizeof(IA32_IDT_GATE_DESCRIPTOR) * 0x100 - 1);

@@ -449,13 +498,13 @@ S3Ready (
   // Allocate stack

   //

   AcpiS3Context->BootScriptStackSize = PcdGet32 (PcdS3BootScriptStackSize);

-  AcpiS3Context->BootScriptStackBase = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateAcpiNvsMemoryBelow4G (PcdGet32 (PcdS3BootScriptStackSize));

+  AcpiS3Context->BootScriptStackBase = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateMemoryBelow4G (EfiReservedMemoryType, PcdGet32 (PcdS3BootScriptStackSize));

   ASSERT (AcpiS3Context->BootScriptStackBase != 0);

 

   //

   // Allocate a code buffer < 4G for S3 debug to load external code

   //

-  AcpiS3Context->S3DebugBufferAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateAcpiNvsMemoryBelow4G (EFI_PAGE_SIZE);

+  AcpiS3Context->S3DebugBufferAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateMemoryBelow4G (EfiReservedMemoryType, EFI_PAGE_SIZE);

 

   DEBUG((EFI_D_INFO, "AcpiS3Context: AcpiFacsTable is 0x%8x\n", AcpiS3Context->AcpiFacsTable));

   DEBUG((EFI_D_INFO, "AcpiS3Context: IdtrProfile is 0x%8x\n", AcpiS3Context->IdtrProfile));

diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.h b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.h
index c2e8b41..65974a3 100644
--- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.h
+++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiS3Save.h
@@ -2,7 +2,7 @@
   This is an implementation of the ACPI S3 Save protocol.  This is defined in 

   S3 boot path specification 0.9.

 

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 

 This program and the accompanying materials

 are licensed and made available under the terms and conditions

@@ -18,106 +18,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _ACPI_S3_SAVE_H_

 #define _ACPI_S3_SAVE_H_

 

-#pragma pack(1)

-

-typedef union {

-  struct {

-    UINT32  LimitLow    : 16;

-    UINT32  BaseLow     : 16;

-    UINT32  BaseMid     : 8;

-    UINT32  Type        : 4;

-    UINT32  System      : 1;

-    UINT32  Dpl         : 2;

-    UINT32  Present     : 1;

-    UINT32  LimitHigh   : 4;

-    UINT32  Software    : 1;

-    UINT32  Reserved    : 1;

-    UINT32  DefaultSize : 1;

-    UINT32  Granularity : 1;

-    UINT32  BaseHigh    : 8;

-  } Bits;

-  UINT64  Uint64;

-} IA32_GDT;

-

-typedef struct {

-  IA32_IDT_GATE_DESCRIPTOR  Ia32IdtEntry;

-  UINT32                    Offset32To63;

-  UINT32                    Reserved;

-} X64_IDT_GATE_DESCRIPTOR;

-

-//

-// Page-Map Level-4 Offset (PML4) and

-// Page-Directory-Pointer Offset (PDPE) entries 4K & 2MB

-//

-

-typedef union {

-  struct {

-    UINT64  Present:1;                // 0 = Not present in memory, 1 = Present in memory

-    UINT64  ReadWrite:1;              // 0 = Read-Only, 1= Read/Write

-    UINT64  UserSupervisor:1;         // 0 = Supervisor, 1=User

-    UINT64  WriteThrough:1;           // 0 = Write-Back caching, 1=Write-Through caching

-    UINT64  CacheDisabled:1;          // 0 = Cached, 1=Non-Cached

-    UINT64  Accessed:1;               // 0 = Not accessed, 1 = Accessed (set by CPU)

-    UINT64  Reserved:1;               // Reserved

-    UINT64  MustBeZero:2;             // Must Be Zero

-    UINT64  Available:3;              // Available for use by system software

-    UINT64  PageTableBaseAddress:40;  // Page Table Base Address

-    UINT64  AvabilableHigh:11;        // Available for use by system software

-    UINT64  Nx:1;                     // No Execute bit

-  } Bits;

-  UINT64    Uint64;

-} PAGE_MAP_AND_DIRECTORY_POINTER;

-

-//

-// Page Table Entry 2MB

-//

-typedef union {

-  struct {

-    UINT64  Present:1;                // 0 = Not present in memory, 1 = Present in memory

-    UINT64  ReadWrite:1;              // 0 = Read-Only, 1= Read/Write

-    UINT64  UserSupervisor:1;         // 0 = Supervisor, 1=User

-    UINT64  WriteThrough:1;           // 0 = Write-Back caching, 1=Write-Through caching

-    UINT64  CacheDisabled:1;          // 0 = Cached, 1=Non-Cached

-    UINT64  Accessed:1;               // 0 = Not accessed, 1 = Accessed (set by CPU)

-    UINT64  Dirty:1;                  // 0 = Not Dirty, 1 = written by processor on access to page

-    UINT64  MustBe1:1;                // Must be 1 

-    UINT64  Global:1;                 // 0 = Not global page, 1 = global page TLB not cleared on CR3 write

-    UINT64  Available:3;              // Available for use by system software

-    UINT64  PAT:1;                    //

-    UINT64  MustBeZero:8;             // Must be zero;

-    UINT64  PageTableBaseAddress:31;  // Page Table Base Address

-    UINT64  AvabilableHigh:11;        // Available for use by system software

-    UINT64  Nx:1;                     // 0 = Execute Code, 1 = No Code Execution

-  } Bits;

-  UINT64    Uint64;

-} PAGE_TABLE_ENTRY;

-

-//

-// Page Table Entry 1GB

-//

-typedef union {

-  struct {

-    UINT64  Present:1;                // 0 = Not present in memory, 1 = Present in memory

-    UINT64  ReadWrite:1;              // 0 = Read-Only, 1= Read/Write

-    UINT64  UserSupervisor:1;         // 0 = Supervisor, 1=User

-    UINT64  WriteThrough:1;           // 0 = Write-Back caching, 1=Write-Through caching

-    UINT64  CacheDisabled:1;          // 0 = Cached, 1=Non-Cached

-    UINT64  Accessed:1;               // 0 = Not accessed, 1 = Accessed (set by CPU)

-    UINT64  Dirty:1;                  // 0 = Not Dirty, 1 = written by processor on access to page

-    UINT64  MustBe1:1;                // Must be 1 

-    UINT64  Global:1;                 // 0 = Not global page, 1 = global page TLB not cleared on CR3 write

-    UINT64  Available:3;              // Available for use by system software

-    UINT64  PAT:1;                    //

-    UINT64  MustBeZero:17;            // Must be zero;

-    UINT64  PageTableBaseAddress:22;  // Page Table Base Address

-    UINT64  AvabilableHigh:11;        // Available for use by system software

-    UINT64  Nx:1;                     // 0 = Execute Code, 1 = No Code Execution

-  } Bits;

-  UINT64    Uint64;

-} PAGE_TABLE_1G_ENTRY;

-

-#pragma pack()

-

 /**

   Gets the buffer of legacy memory below 1 MB 

   This function is to get the buffer in legacy memory below 1MB that is required during S3 resume.

diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiVariableThunkPlatform.c b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiVariableThunkPlatform.c
index 883b790..641a0ae 100644
--- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiVariableThunkPlatform.c
+++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiS3SaveDxe/AcpiVariableThunkPlatform.c
@@ -1,7 +1,7 @@
 /** @file

   This is an implementation of the AcpiVariable platform field for ECP platform.

 

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>

 

 This program and the accompanying materials

 are licensed and made available under the terms and conditions

@@ -47,18 +47,20 @@ GLOBAL_REMOVE_IF_UNREFERENCED
 ACPI_VARIABLE_SET_COMPATIBILITY               *mAcpiVariableSetCompatibility = NULL;

 

 /**

-  Allocate EfiACPIMemoryNVS below 4G memory address.

+  Allocate memory below 4G memory address.

 

-  This function allocates EfiACPIMemoryNVS below 4G memory address.

+  This function allocates memory below 4G memory address.

 

+  @param  MemoryType   Memory type of memory to allocate.

   @param  Size         Size of memory to allocate.

   

   @return Allocated address for output.

 

 **/

 VOID*

-AllocateAcpiNvsMemoryBelow4G (

-  IN   UINTN   Size

+AllocateMemoryBelow4G (

+  IN EFI_MEMORY_TYPE    MemoryType,

+  IN UINTN              Size

   );

 

 /**

@@ -81,7 +83,7 @@ S3ReadyThunkPlatform (
   //

   // Allocate ACPI reserved memory under 4G

   //

-  AcpiMemoryBase = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateAcpiNvsMemoryBelow4G (PcdGet32 (PcdS3AcpiReservedMemorySize));

+  AcpiMemoryBase = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateMemoryBelow4G (EfiReservedMemoryType, PcdGet32 (PcdS3AcpiReservedMemorySize));

   ASSERT (AcpiMemoryBase != 0);

   AcpiMemorySize = PcdGet32 (PcdS3AcpiReservedMemorySize);

 

@@ -151,7 +153,7 @@ InstallAcpiS3SaveThunk (
     // Allocate/initialize the compatible version of Acpi Variable Set since Framework chipset/platform 

     // driver need this variable

     //

-    mAcpiVariableSetCompatibility = AllocateAcpiNvsMemoryBelow4G (sizeof(ACPI_VARIABLE_SET_COMPATIBILITY));

+    mAcpiVariableSetCompatibility = AllocateMemoryBelow4G (EfiACPIMemoryNVS, sizeof(ACPI_VARIABLE_SET_COMPATIBILITY));

     Status = gRT->SetVariable (

                     ACPI_GLOBAL_VARIABLE,

                     &gEfiAcpiVariableCompatiblityGuid,

diff --git a/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportAcpiSupportProtocol.c b/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportAcpiSupportProtocol.c
index a54cffb..107db88 100644
--- a/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportAcpiSupportProtocol.c
+++ b/IntelFrameworkModulePkg/Universal/Acpi/AcpiSupportDxe/AcpiSupportAcpiSupportProtocol.c
@@ -1,7 +1,7 @@
 /** @file

   ACPI Support Protocol implementation

 

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 

 This program and the accompanying materials

 are licensed and made available under the terms and conditions

@@ -776,14 +776,24 @@ AddTableToList (
 

       //

       // Update pointers in FADT.  If tables don't exist this will put NULL pointers there.

+      // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and 

+      // vice-versa.

       //

-      AcpiSupportInstance->Fadt3->FirmwareCtrl  = (UINT32) (UINTN) AcpiSupportInstance->Facs3;

-      Buffer64 = (UINT64) (UINTN) AcpiSupportInstance->Facs3;

-      CopyMem (

-        &AcpiSupportInstance->Fadt3->XFirmwareCtrl,

-        &Buffer64,

-        sizeof (UINT64)

-        );

+      if ((UINT64)(UINTN)AcpiSupportInstance->Facs3 < BASE_4GB) {

+        AcpiSupportInstance->Fadt3->FirmwareCtrl = (UINT32) (UINTN) AcpiSupportInstance->Facs3;

+        ZeroMem (

+          &AcpiSupportInstance->Fadt3->XFirmwareCtrl,

+          sizeof (UINT64)

+          );

+      } else {

+        AcpiSupportInstance->Fadt3->FirmwareCtrl = 0;

+        Buffer64 = (UINT64) (UINTN) AcpiSupportInstance->Facs3;

+        CopyMem (

+          &AcpiSupportInstance->Fadt3->XFirmwareCtrl,

+          &Buffer64,

+          sizeof (UINT64)

+          );

+      }

       AcpiSupportInstance->Fadt3->Dsdt  = (UINT32) (UINTN) AcpiSupportInstance->Dsdt3;

       Buffer64                          = (UINT64) (UINTN) AcpiSupportInstance->Dsdt3;

       CopyMem (

@@ -900,13 +910,20 @@ AddTableToList (
       // If FADT already exists, update table pointers.

       //

       if (AcpiSupportInstance->Fadt3 != NULL) {

-        AcpiSupportInstance->Fadt3->FirmwareCtrl  = (UINT32) (UINTN) AcpiSupportInstance->Facs3;

-        Buffer64 = (UINT64) (UINTN) AcpiSupportInstance->Facs3;

-        CopyMem (

-          &AcpiSupportInstance->Fadt3->XFirmwareCtrl,

-          &Buffer64,

-          sizeof (UINT64)

-          );

+        //

+        // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and 

+        // vice-versa.

+        //

+        if ((UINT64)(UINTN)AcpiSupportInstance->Facs3 < BASE_4GB) {

+          AcpiSupportInstance->Fadt3->FirmwareCtrl  = (UINT32) (UINTN) AcpiSupportInstance->Facs3;

+        } else {

+          Buffer64 = (UINT64) (UINTN) AcpiSupportInstance->Facs3;

+          CopyMem (

+            &AcpiSupportInstance->Fadt3->XFirmwareCtrl,

+            &Buffer64,

+            sizeof (UINT64)

+            );

+        }

 

         //

         // Checksum FADT table

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
index 6505de8..56a8312 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
@@ -1,7 +1,7 @@
 /** @file

   ACPI Table Protocol Implementation

 

-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -717,14 +717,19 @@ AddTableToList (
 

       //

       // Update pointers in FADT.  If tables don't exist this will put NULL pointers there.

+      // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and 

+      // vice-versa.

       //

-      AcpiTableInstance->Fadt3->FirmwareCtrl  = (UINT32) (UINTN) AcpiTableInstance->Facs3;

-      Buffer64 = (UINT64) (UINTN) AcpiTableInstance->Facs3;

-      CopyMem (

-        &AcpiTableInstance->Fadt3->XFirmwareCtrl,

-        &Buffer64,

-        sizeof (UINT64)

-        );

+      if ((UINT64)(UINTN)AcpiTableInstance->Facs3 < BASE_4GB) {

+        AcpiTableInstance->Fadt3->FirmwareCtrl  = (UINT32) (UINTN) AcpiTableInstance->Facs3;

+      } else {

+        Buffer64 = (UINT64) (UINTN) AcpiTableInstance->Facs3;

+        CopyMem (

+          &AcpiTableInstance->Fadt3->XFirmwareCtrl,

+          &Buffer64,

+          sizeof (UINT64)

+          );

+      }

       AcpiTableInstance->Fadt3->Dsdt  = (UINT32) (UINTN) AcpiTableInstance->Dsdt3;

       Buffer64                          = (UINT64) (UINTN) AcpiTableInstance->Dsdt3;

       CopyMem (

@@ -840,13 +845,20 @@ AddTableToList (
       // If FADT already exists, update table pointers.

       //

       if (AcpiTableInstance->Fadt3 != NULL) {

-        AcpiTableInstance->Fadt3->FirmwareCtrl  = (UINT32) (UINTN) AcpiTableInstance->Facs3;

-        Buffer64 = (UINT64) (UINTN) AcpiTableInstance->Facs3;

-        CopyMem (

-          &AcpiTableInstance->Fadt3->XFirmwareCtrl,

-          &Buffer64,

-          sizeof (UINT64)

-          );

+        //

+        // Note: If the FIRMWARE_CTRL is non-zero, then X_FIRMWARE_CTRL must be zero, and 

+        // vice-versa.

+        //

+        if ((UINT64)(UINTN)AcpiTableInstance->Facs3 < BASE_4GB) {

+          AcpiTableInstance->Fadt3->FirmwareCtrl  = (UINT32) (UINTN) AcpiTableInstance->Facs3;

+        } else {

+          Buffer64 = (UINT64) (UINTN) AcpiTableInstance->Facs3;

+          CopyMem (

+            &AcpiTableInstance->Fadt3->XFirmwareCtrl,

+            &Buffer64,

+            sizeof (UINT64)

+            );

+        }

 

         //

         // Checksum FADT table

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/SetIdtEntry.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/SetIdtEntry.c
index 9f04959..ae0ff5c 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/SetIdtEntry.c
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/SetIdtEntry.c
@@ -15,22 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 **/

 #include "ScriptExecute.h"

-//

-// INTERRUPT_GATE_DESCRIPTOR and SetIdtEntry () are used to setup IDT to do debug

-//

 

-#pragma pack(1)

-

-typedef struct {

-  UINT16  OffsetLow;

-  UINT16  SegmentSelector;

-  UINT16  Attributes;

-  UINT16  OffsetHigh;

-} INTERRUPT_GATE_DESCRIPTOR;

-

-#define INTERRUPT_GATE_ATTRIBUTE   0x8e00

-

-#pragma pack()

 /**

   Set a IDT entry for interrupt vector 3 for debug purpose.

 

@@ -42,7 +27,7 @@ SetIdtEntry (
   IN ACPI_S3_CONTEXT     *AcpiS3Context

   )

 {

-  INTERRUPT_GATE_DESCRIPTOR                     *IdtEntry;

+  IA32_IDT_GATE_DESCRIPTOR                      *IdtEntry;

   IA32_DESCRIPTOR                               *IdtDescriptor;

   UINTN                                         S3DebugBuffer;

 

@@ -50,14 +35,21 @@ SetIdtEntry (
   // Restore IDT for debug

   //

   IdtDescriptor = (IA32_DESCRIPTOR *) (UINTN) (AcpiS3Context->IdtrProfile);

-  IdtEntry = (INTERRUPT_GATE_DESCRIPTOR *)(IdtDescriptor->Base + (3 * sizeof (INTERRUPT_GATE_DESCRIPTOR)));

-  S3DebugBuffer = (UINTN) (AcpiS3Context->S3DebugBufferAddress);

-

-  IdtEntry->OffsetLow       = (UINT16)S3DebugBuffer;

-  IdtEntry->SegmentSelector = (UINT16)AsmReadCs ();

-  IdtEntry->Attributes      = (UINT16)INTERRUPT_GATE_ATTRIBUTE;

-  IdtEntry->OffsetHigh      = (UINT16)(S3DebugBuffer >> 16);

-

   AsmWriteIdtr (IdtDescriptor);

+

+  DEBUG_CODE (

+    //

+    // Update IDT entry INT3 if the instruction is valid in it

+    //

+    S3DebugBuffer = (UINTN) (AcpiS3Context->S3DebugBufferAddress);

+    if (*(UINTN *)S3DebugBuffer != (UINTN) -1) {

+      IdtEntry = (IA32_IDT_GATE_DESCRIPTOR *)(IdtDescriptor->Base + (3 * sizeof (IA32_IDT_GATE_DESCRIPTOR)));

+      IdtEntry->Bits.OffsetLow      = (UINT16)S3DebugBuffer;

+      IdtEntry->Bits.Selector       = (UINT16)AsmReadCs ();

+      IdtEntry->Bits.Reserved_0     = 0;

+      IdtEntry->Bits.GateType       = IA32_IDT_GATE_TYPE_INTERRUPT_32;

+      IdtEntry->Bits.OffsetHigh     = (UINT16)(S3DebugBuffer >> 16);

+    }

+  );

 }

 

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c
index 2b75964..2a3e6ef 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c
@@ -230,7 +230,7 @@ BootScriptExecutorEntryPoint (
   if (EFI_ERROR (Status)) {

 

       //

-      // This is the first-time loaded by DXE core. reload itself to NVS mem

+      // This is the first-time loaded by DXE core. reload itself to RESERVED mem

       //

       //

       // A workarouond: Here we install a dummy handle

@@ -263,7 +263,7 @@ BootScriptExecutorEntryPoint (
       FfsBuffer = 0xFFFFFFFF;

       Status = gBS->AllocatePages (

                     AllocateMaxAddress,

-                    EfiACPIMemoryNVS,

+                    EfiReservedMemoryType,

                     Pages,

                     &FfsBuffer

                     );

@@ -320,7 +320,7 @@ BootScriptExecutorEntryPoint (
 

     } else {

       //

-      // the entry point is invoked after reloading. following code only run in  ACPI NVS

+      // the entry point is invoked after reloading. following code only run in RESERVED mem

       //

       BufferSize = sizeof (BOOT_SCRIPT_EXECUTOR_VARIABLE);

 

@@ -328,7 +328,7 @@ BootScriptExecutorEntryPoint (
       Pages = EFI_SIZE_TO_PAGES(BufferSize);

       Status = gBS->AllocatePages (

                       AllocateMaxAddress,

-                      EfiACPIMemoryNVS,

+                      EfiReservedMemoryType,

                       Pages,

                       &BootScriptExecutorBuffer

                       );

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
index 4589d8d..2822a42 100644
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
@@ -3,7 +3,7 @@
 

   Set a IDT entry for interrupt vector 3 for debug purpose for x64 platform

 

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>

 

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

@@ -15,24 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 **/

 #include "ScriptExecute.h"

-//

-// INTERRUPT_GATE_DESCRIPTOR and SetIdtEntry () are used to setup IDT to do debug

-//

-

-#pragma pack(1)

-

-typedef struct {

-  UINT16    Offset15To0;

-  UINT16    SegmentSelector;

-  UINT16    Attributes;

-  UINT16    Offset31To16;

-  UINT32    Offset63To32;

-  UINT32    Reserved;

-} INTERRUPT_GATE_DESCRIPTOR;

-

-#define INTERRUPT_GATE_ATTRIBUTE   0x8e00

-

-#pragma pack()

 

 #define IA32_PG_P                   BIT0

 #define IA32_PG_RW                  BIT1

@@ -61,11 +43,12 @@ PageFaultHandlerHook (
 **/

 VOID

 HookPageFaultHandler (

-  IN INTERRUPT_GATE_DESCRIPTOR                     *IdtEntry

+  IN IA32_IDT_GATE_DESCRIPTOR                   *IdtEntry

   )

 {

   UINT32         RegEax;

   UINT32         RegEdx;

+  UINTN          PageFaultHandlerHookAddress;

 

   AsmCpuid (0x80000008, &RegEax, NULL, NULL, NULL);

   mPhyMask = LShiftU64 (1, (UINT8)RegEax) - 1;

@@ -85,13 +68,15 @@ HookPageFaultHandler (
   //

   // Set Page Fault entry to catch >4G access

   //

-  mOriginalHandler = (VOID *)(UINTN)(LShiftU64 (IdtEntry->Offset63To32, 32) + IdtEntry->Offset15To0 + (IdtEntry->Offset31To16 << 16));

-  IdtEntry->Offset15To0     = (UINT16)((UINTN)PageFaultHandlerHook);

-  IdtEntry->SegmentSelector = (UINT16)AsmReadCs ();

-  IdtEntry->Attributes      = (UINT16)INTERRUPT_GATE_ATTRIBUTE;

-  IdtEntry->Offset31To16    = (UINT16)((UINTN)PageFaultHandlerHook >> 16);

-  IdtEntry->Offset63To32    = (UINT32)((UINTN)PageFaultHandlerHook >> 32);

-  IdtEntry->Reserved        = 0;

+  PageFaultHandlerHookAddress = (UINTN)PageFaultHandlerHook;

+  mOriginalHandler = (VOID *)(UINTN)(LShiftU64 (IdtEntry->Bits.OffsetUpper, 32) + IdtEntry->Bits.OffsetLow + (IdtEntry->Bits.OffsetHigh << 16));

+  IdtEntry->Bits.OffsetLow      = (UINT16)PageFaultHandlerHookAddress;

+  IdtEntry->Bits.Selector       = (UINT16)AsmReadCs ();

+  IdtEntry->Bits.Reserved_0     = 0;

+  IdtEntry->Bits.GateType       = IA32_IDT_GATE_TYPE_INTERRUPT_32;

+  IdtEntry->Bits.OffsetHigh     = (UINT16)(PageFaultHandlerHookAddress >> 16);

+  IdtEntry->Bits.OffsetUpper    = (UINT32)(PageFaultHandlerHookAddress >> 32);

+  IdtEntry->Bits.Reserved_1     = 0;

 

   if (mPage1GSupport) {

     mS3NvsPageTableAddress = (UINTN)(AsmReadCr3 () & mPhyMask) + EFI_PAGES_TO_SIZE(2);

@@ -111,7 +96,7 @@ SetIdtEntry (
   IN ACPI_S3_CONTEXT     *AcpiS3Context

   )

 {

-  INTERRUPT_GATE_DESCRIPTOR                     *IdtEntry;

+  IA32_IDT_GATE_DESCRIPTOR                      *IdtEntry;

   IA32_DESCRIPTOR                               *IdtDescriptor;

   UINTN                                         S3DebugBuffer;

 

@@ -119,20 +104,27 @@ SetIdtEntry (
   // Restore IDT for debug

   //

   IdtDescriptor = (IA32_DESCRIPTOR *) (UINTN) (AcpiS3Context->IdtrProfile);

-  IdtEntry = (INTERRUPT_GATE_DESCRIPTOR *)(IdtDescriptor->Base + (3 * sizeof (INTERRUPT_GATE_DESCRIPTOR)));

-  S3DebugBuffer = (UINTN) (AcpiS3Context->S3DebugBufferAddress);

+  AsmWriteIdtr (IdtDescriptor);

 

-  IdtEntry->Offset15To0     = (UINT16)S3DebugBuffer;

-  IdtEntry->SegmentSelector = (UINT16)AsmReadCs ();

-  IdtEntry->Attributes      = (UINT16)INTERRUPT_GATE_ATTRIBUTE;

-  IdtEntry->Offset31To16    = (UINT16)(S3DebugBuffer >> 16);

-  IdtEntry->Offset63To32    = (UINT32)(S3DebugBuffer >> 32);

-  IdtEntry->Reserved        = 0;

+  DEBUG_CODE (

+    //

+    // Update IDT entry INT3 if the instruction is valid in it

+    //

+    S3DebugBuffer = (UINTN) (AcpiS3Context->S3DebugBufferAddress);

+    if (*(UINTN *)S3DebugBuffer != (UINTN) -1) {

+      IdtEntry = (IA32_IDT_GATE_DESCRIPTOR *)(IdtDescriptor->Base + (3 * sizeof (IA32_IDT_GATE_DESCRIPTOR)));

+      IdtEntry->Bits.OffsetLow      = (UINT16)S3DebugBuffer;

+      IdtEntry->Bits.Selector       = (UINT16)AsmReadCs ();

+      IdtEntry->Bits.Reserved_0     = 0;

+      IdtEntry->Bits.GateType       = IA32_IDT_GATE_TYPE_INTERRUPT_32;

+      IdtEntry->Bits.OffsetHigh     = (UINT16)(S3DebugBuffer >> 16);

+      IdtEntry->Bits.OffsetUpper    = (UINT32)(S3DebugBuffer >> 32);

+      IdtEntry->Bits.Reserved_1     = 0;

+    }

+  );

 

-  IdtEntry = (INTERRUPT_GATE_DESCRIPTOR *)(IdtDescriptor->Base + (14 * sizeof (INTERRUPT_GATE_DESCRIPTOR)));

+  IdtEntry = (IA32_IDT_GATE_DESCRIPTOR *)(IdtDescriptor->Base + (14 * sizeof (IA32_IDT_GATE_DESCRIPTOR)));

   HookPageFaultHandler (IdtEntry);

-

-  AsmWriteIdtr (IdtDescriptor);

 }

 

 /**