MdePkg/ProcessorBind: add defines for page allocation granularity

[mirror_edk2.git] / MdePkg / Include / Uefi / UefiMultiPhase.h

diff --git a/MdePkg/Include/Uefi/UefiMultiPhase.h b/MdePkg/Include/Uefi/UefiMultiPhase.h
index e0142710efcad327091944740a688f0edba09e0a..9f1ef3ecb066311770fac271965540c3966c0677 100644 (file)
--- a/MdePkg/Include/Uefi/UefiMultiPhase.h
+++ b/MdePkg/Include/Uefi/UefiMultiPhase.h
@@ -1,14 +1,14 @@
 /** @file\r
   This includes some definitions introduced in UEFI that will be used in both PEI and DXE phases.\r
 \r
 /** @file\r
   This includes some definitions introduced in UEFI that will be used in both PEI and DXE phases.\r
 \r

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under \r
-the terms and conditions of the BSD License that accompanies this distribution.  \r
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under\r
+the terms and conditions of the BSD License that accompanies this distribution.\r

 The full text of the license may be found at\r
 The full text of the license may be found at\r

-http://opensource.org/licenses/bsd-license.php.                                          \r
-    \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+http://opensource.org/licenses/bsd-license.php.\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 **/\r
 \r
 \r
 **/\r
 \r


@@ -18,14 +18,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/WinCertificate.h>\r
 ///\r
 /// Enumeration of memory types introduced in UEFI.\r
 #include <Guid/WinCertificate.h>\r
 ///\r
 /// Enumeration of memory types introduced in UEFI.\r

-/// \r
+///\r

 typedef enum {\r
   ///\r
   /// Not used.\r
   ///\r
   EfiReservedMemoryType,\r
   ///\r
 typedef enum {\r
   ///\r
   /// Not used.\r
   ///\r
   EfiReservedMemoryType,\r
   ///\r

-  /// The code portions of a loaded application. \r
+  /// The code portions of a loaded application.\r

   /// (Note that UEFI OS loaders are UEFI applications.)\r
   ///\r
   EfiLoaderCode,\r
   /// (Note that UEFI OS loaders are UEFI applications.)\r
   ///\r
   EfiLoaderCode,\r


@@ -82,12 +82,50 @@ typedef enum {
   /// Address space reserved by the firmware for code that is part of the processor.\r
   ///\r
   EfiPalCode,\r
   /// Address space reserved by the firmware for code that is part of the processor.\r
   ///\r
   EfiPalCode,\r

+  ///\r
+  /// A memory region that operates as EfiConventionalMemory, \r
+  /// however it happens to also support byte-addressable non-volatility.\r
+  ///\r
+  EfiPersistentMemory,\r

   EfiMaxMemoryType\r
 } EFI_MEMORY_TYPE;\r
 \r
   EfiMaxMemoryType\r
 } EFI_MEMORY_TYPE;\r
 \r

+///\r
+/// Enumeration of reset types.\r
+///\r
+typedef enum {\r
+  ///\r
+  /// Used to induce a system-wide reset. This sets all circuitry within the\r
+  /// system to its initial state.  This type of reset is asynchronous to system\r
+  /// operation and operates withgout regard to cycle boundaries.  EfiColdReset\r
+  /// is tantamount to a system power cycle.\r
+  ///\r
+  EfiResetCold,\r
+  ///\r
+  /// Used to induce a system-wide initialization. The processors are set to their\r
+  /// initial state, and pending cycles are not corrupted.  If the system does\r
+  /// not support this reset type, then an EfiResetCold must be performed.\r
+  ///\r
+  EfiResetWarm,\r
+  ///\r
+  /// Used to induce an entry into a power state equivalent to the ACPI G2/S5 or G3\r
+  /// state.  If the system does not support this reset type, then when the system\r
+  /// is rebooted, it should exhibit the EfiResetCold attributes.\r
+  ///\r
+  EfiResetShutdown,\r
+  ///\r
+  /// Used to induce a system-wide reset. The exact type of the reset is defined by\r
+  /// the EFI_GUID that follows the Null-terminated Unicode string passed into\r
+  /// ResetData. If the platform does not recognize the EFI_GUID in ResetData the\r
+  /// platform must pick a supported reset type to perform. The platform may\r
+  /// optionally log the parameters from any non-normal reset that occurs.\r
+  ///\r
+  EfiResetPlatformSpecific\r
+} EFI_RESET_TYPE;\r
+\r

 ///\r
 /// Data structure that precedes all of the standard EFI table types.\r
 ///\r
 /// Data structure that precedes all of the standard EFI table types.\r

-/// \r
+///\r

 typedef struct {\r
   ///\r
   /// A 64-bit signature that identifies the type of table that follows.\r
 typedef struct {\r
   ///\r
   /// A 64-bit signature that identifies the type of table that follows.\r


@@ -119,14 +157,14 @@ typedef struct {
 \r
 ///\r
 /// Attributes of variable.\r
 \r
 ///\r
 /// Attributes of variable.\r

-/// \r
+///\r

 #define EFI_VARIABLE_NON_VOLATILE                            0x00000001\r
 #define EFI_VARIABLE_BOOTSERVICE_ACCESS                      0x00000002\r
 #define EFI_VARIABLE_RUNTIME_ACCESS                          0x00000004\r
 ///\r
 #define EFI_VARIABLE_NON_VOLATILE                            0x00000001\r
 #define EFI_VARIABLE_BOOTSERVICE_ACCESS                      0x00000002\r
 #define EFI_VARIABLE_RUNTIME_ACCESS                          0x00000004\r
 ///\r

-/// This attribute is identified by the mnemonic 'HR' \r
+/// This attribute is identified by the mnemonic 'HR'\r

 /// elsewhere in this specification.\r
 /// elsewhere in this specification.\r

-/// \r
+///\r

 #define EFI_VARIABLE_HARDWARE_ERROR_RECORD                   0x00000008\r
 ///\r
 /// Attributes of Authenticated Variable\r
 #define EFI_VARIABLE_HARDWARE_ERROR_RECORD                   0x00000008\r
 ///\r
 /// Attributes of Authenticated Variable\r


@@ -136,7 +174,7 @@ typedef struct {
 #define EFI_VARIABLE_APPEND_WRITE                            0x00000040\r
 \r
 \r
 #define EFI_VARIABLE_APPEND_WRITE                            0x00000040\r
 \r
 \r

-///   \r
+///\r

 /// AuthInfo is a WIN_CERTIFICATE using the wCertificateType\r
 /// WIN_CERTIFICATE_UEFI_GUID and the CertType\r
 /// EFI_CERT_TYPE_RSA2048_SHA256_GUID. If the attribute specifies\r
 /// AuthInfo is a WIN_CERTIFICATE using the wCertificateType\r
 /// WIN_CERTIFICATE_UEFI_GUID and the CertType\r
 /// EFI_CERT_TYPE_RSA2048_SHA256_GUID. If the attribute specifies\r


@@ -150,41 +188,41 @@ typedef struct {
 /// WIN_CERTIFICATE shall be used to describe the signature of the\r
 /// Variable data *Data. In addition, the signature will also\r
 /// include the MonotonicCount value to guard against replay attacks.\r
 /// WIN_CERTIFICATE shall be used to describe the signature of the\r
 /// Variable data *Data. In addition, the signature will also\r
 /// include the MonotonicCount value to guard against replay attacks.\r

-///  \r
+///\r

 typedef struct {\r
   ///\r
 typedef struct {\r
   ///\r

-  /// Included in the signature of        \r
+  /// Included in the signature of\r

   /// AuthInfo.Used to ensure freshness/no\r
   /// AuthInfo.Used to ensure freshness/no\r

-  /// replay. Incremented during each     \r
-  /// "Write" access.   \r
-  ///                  \r
+  /// replay. Incremented during each\r
+  /// "Write" access.\r
+  ///\r

   UINT64                      MonotonicCount;\r
   ///\r
   UINT64                      MonotonicCount;\r
   ///\r

-  /// Provides the authorization for the variable \r
-  /// access. It is a signature across the        \r
-  /// variable data and the  Monotonic Count      \r
-  /// value. Caller uses Private key that is      \r
-  /// associated with a public key that has been  \r
-  /// provisioned via the key exchange.           \r
+  /// Provides the authorization for the variable\r
+  /// access. It is a signature across the\r
+  /// variable data and the  Monotonic Count\r
+  /// value. Caller uses Private key that is\r
+  /// associated with a public key that has been\r
+  /// provisioned via the key exchange.\r

   ///\r
   WIN_CERTIFICATE_UEFI_GUID   AuthInfo;\r
 } EFI_VARIABLE_AUTHENTICATION;\r
 \r
 ///\r
   ///\r
   WIN_CERTIFICATE_UEFI_GUID   AuthInfo;\r
 } EFI_VARIABLE_AUTHENTICATION;\r
 \r
 ///\r

-/// When the attribute EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS is \r
+/// When the attribute EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS is\r

 /// set, then the Data buffer shall begin with an instance of a complete (and serialized)\r
 /// set, then the Data buffer shall begin with an instance of a complete (and serialized)\r

-/// EFI_VARIABLE_AUTHENTICATION_2 descriptor. The descriptor shall be followed by the new \r
-/// variable value and DataSize shall reflect the combined size of the descriptor and the new \r
-/// variable value. The authentication descriptor is not part of the variable data and is not \r
+/// EFI_VARIABLE_AUTHENTICATION_2 descriptor. The descriptor shall be followed by the new\r
+/// variable value and DataSize shall reflect the combined size of the descriptor and the new\r
+/// variable value. The authentication descriptor is not part of the variable data and is not\r

 /// returned by subsequent calls to GetVariable().\r
 ///\r
 typedef struct {\r
   ///\r
 /// returned by subsequent calls to GetVariable().\r
 ///\r
 typedef struct {\r
   ///\r

-  /// For the TimeStamp value, components Pad1, Nanosecond, TimeZone, Daylight and \r
+  /// For the TimeStamp value, components Pad1, Nanosecond, TimeZone, Daylight and\r

   /// Pad2 shall be set to 0. This means that the time shall always be expressed in GMT.\r
   ///\r
   EFI_TIME                    TimeStamp;\r
   /// Pad2 shall be set to 0. This means that the time shall always be expressed in GMT.\r
   ///\r
   EFI_TIME                    TimeStamp;\r

-  /// \r
+  ///\r

   /// Only a CertType of  EFI_CERT_TYPE_PKCS7_GUID is accepted.\r
   ///\r
   WIN_CERTIFICATE_UEFI_GUID   AuthInfo;\r
   /// Only a CertType of  EFI_CERT_TYPE_PKCS7_GUID is accepted.\r
   ///\r
   WIN_CERTIFICATE_UEFI_GUID   AuthInfo;\r