Move EFI_SMRAM_DESCRIPTOR into PiMultiPhase.h. Since the top level includes in the other packages all include PiPei.h or PiDxe.h, and PiPei.h and PiDxe.h both include PiuMultiPhase.h, EFI_SMRAM_DESCRIPTOR will be declared for SMM Access 2 Protocol and the SmramMemoryReserve GUIDed HOB.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10105 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 41 insertions, 42 deletions

diff --git a/MdePkg/Include/Pi/PiMultiPhase.h b/MdePkg/Include/Pi/PiMultiPhase.h
index b8decc5fbf..8dcc0d1670 100644
--- a/MdePkg/Include/Pi/PiMultiPhase.h
+++ b/MdePkg/Include/Pi/PiMultiPhase.h
@@ -1,7 +1,7 @@
 /** @file

   Include file matches things in PI for multiple module types.

 

-  Copyright (c) 2006 - 2009, Intel Corporation                                                         

+  Copyright (c) 2006 - 2010, Intel Corporation                                                         

   All rights reserved. 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        

@@ -94,4 +94,43 @@
 #define EFI_AUTH_STATUS_ALL                 0x0f

 ///@}

 

+///

+/// SMRAM states and capabilities

+///

+#define EFI_SMRAM_OPEN                  0x00000001

+#define EFI_SMRAM_CLOSED                0x00000002

+#define EFI_SMRAM_LOCKED                0x00000004

+#define EFI_CACHEABLE                   0x00000008

+#define EFI_ALLOCATED                   0x00000010

+#define EFI_NEEDS_TESTING               0x00000020

+#define EFI_NEEDS_ECC_INITIALIZATION    0x00000040

+

+///

+/// Structure describing a SMRAM region and its accessibility attributes

+///

+typedef struct {

+  ///

+  /// Designates the physical address of the SMRAM in memory. This view of memory is 

+  /// the same as seen by I/O-based agents, for example, but it may not be the address seen 

+  /// by the processors.

+  ///

+  EFI_PHYSICAL_ADDRESS  PhysicalStart;

+  ///

+  /// Designates the address of the SMRAM, as seen by software executing on the 

+  /// processors. This address may or may not match PhysicalStart.

+  ///

+  EFI_PHYSICAL_ADDRESS  CpuStart;       

+  ///

+  /// Describes the number of bytes in the SMRAM region.

+  ///

+  UINT64                PhysicalSize;

+  ///

+  /// Describes the accessibility attributes of the SMRAM.  These attributes include the 

+  /// hardware state (e.g., Open/Closed/Locked), capability (e.g., cacheable), logical 

+  /// allocation (e.g., allocated), and pre-use initialization (e.g., needs testing/ECC 

+  /// initialization).

+  ///

+  UINT64                RegionState;

+} EFI_SMRAM_DESCRIPTOR;

+

 #endif

diff --git a/MdePkg/Include/Protocol/SmmAccess2.h b/MdePkg/Include/Protocol/SmmAccess2.h
index d33578d275..a8c6c2ebe0 100644
--- a/MdePkg/Include/Protocol/SmmAccess2.h
+++ b/MdePkg/Include/Protocol/SmmAccess2.h
@@ -11,7 +11,7 @@
   - Preserving the system integrity, or "locking" the SMRAM, such that the settings cannot be 

     perturbed by either boot service or runtime agents 

 

-  Copyright (c) 2009, Intel Corporation                                                         

+  Copyright (c) 2009 - 2010, Intel Corporation                                                         

   All rights reserved. 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        

@@ -25,8 +25,6 @@
 #ifndef _SMM_ACCESS2_H_

 #define _SMM_ACCESS2_H_

 

-#include <PiDxe.h>

-

 ///

 /// Note:

 ///   To avoid name conflict between PI and Framework SMM spec, the following names defined

@@ -43,44 +41,6 @@
      0xc2702b74, 0x800c, 0x4131, {0x87, 0x46, 0x8f, 0xb5, 0xb8, 0x9c, 0xe4, 0xac } \

   }

 

-///

-/// SMRAM states and capabilities

-///

-#define EFI_SMRAM_OPEN                  0x00000001

-#define EFI_SMRAM_CLOSED                0x00000002

-#define EFI_SMRAM_LOCKED                0x00000004

-#define EFI_CACHEABLE                   0x00000008

-#define EFI_ALLOCATED                   0x00000010

-#define EFI_NEEDS_TESTING               0x00000020

-#define EFI_NEEDS_ECC_INITIALIZATION    0x00000040

-

-///

-/// Structure describing a SMRAM region and its accessibility attributes

-///

-typedef struct {

-  ///

-  /// Designates the physical address of the SMRAM in memory. This view of memory is 

-  /// the same as seen by I/O-based agents, for example, but it may not be the address seen 

-  /// by the processors.

-  ///

-  EFI_PHYSICAL_ADDRESS  PhysicalStart;

-  ///

-  /// Designates the address of the SMRAM, as seen by software executing on the 

-  /// processors. This address may or may not match PhysicalStart.

-  ///

-  EFI_PHYSICAL_ADDRESS  CpuStart;       

-  ///

-  /// Describes the number of bytes in the SMRAM region.

-  ///

-  UINT64                PhysicalSize;

-  ///

-  /// Describes the accessibility attributes of the SMRAM.  These attributes include the 

-  /// hardware state (e.g., Open/Closed/Locked), capability (e.g., cacheable), logical 

-  /// allocation (e.g., allocated), and pre-use initialization (e.g., needs testing/ECC 

-  /// initialization).

-  ///

-  UINT64                RegionState;

-} EFI_SMRAM_DESCRIPTOR;

 

 typedef struct _EFI_SMM_ACCESS2_PROTOCOL  EFI_SMM_ACCESS2_PROTOCOL;