MdePkg: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / MdePkg / Include / Guid / Cper.h

diff --git a/MdePkg/Include/Guid/Cper.h b/MdePkg/Include/Guid/Cper.h
index 62493ef76098f94b9c7872d9ae39b3a0c830380d..0cacd30f0196b069a02d0b4574b3f82dae1acdff 100644 (file)
--- a/MdePkg/Include/Guid/Cper.h
+++ b/MdePkg/Include/Guid/Cper.h
@@ -1,17 +1,12 @@
 /** @file\r
   GUIDs and definitions used for Common Platform Error Record.\r
 \r
-  Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>\r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  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
+  Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
   @par Revision Reference:\r
-  GUIDs defined in UEFI 2.4 Specification.\r
+  GUIDs defined in UEFI 2.7 Specification.\r
 \r
 **/\r
 \r
@@ -23,6 +18,8 @@
 #define EFI_ERROR_RECORD_SIGNATURE_START   SIGNATURE_32('C', 'P', 'E', 'R')\r
 #define EFI_ERROR_RECORD_SIGNATURE_END     0xFFFFFFFF\r
 \r
+#define EFI_ERROR_RECORD_REVISION          0x0101\r
+\r
 ///\r
 /// Error Severity in Error Record Header and Error Section Descriptor\r
 ///@{\r
@@ -137,6 +134,8 @@ typedef struct {
   ///\r
 } EFI_COMMON_ERROR_RECORD_HEADER;\r
 \r
+#define EFI_ERROR_SECTION_REVISION  0x0100\r
+\r
 ///\r
 /// Validity Fields in Error Section Descriptor.\r
 ///\r
@@ -165,6 +164,14 @@ typedef struct {
   { \\r
     0xdc3ea0b0, 0xa144, 0x4797, { 0xb9, 0x5b, 0x53, 0xfa, 0x24, 0x2b, 0x6e, 0x1d } \\r
   }\r
+#define EFI_ERROR_SECTION_PROCESSOR_SPECIFIC_IA32X64_GUID \\r
+  { \\r
+    0xdc3ea0b0, 0xa144, 0x4797, { 0xb9, 0x5b, 0x53, 0xfa, 0x24, 0x2b, 0x6e, 0x1d } \\r
+  }\r
+#define EFI_ERROR_SECTION_PROCESSOR_SPECIFIC_ARM_GUID \\r
+  { \\r
+    0xe19e3d16, 0xbc11, 0x11e4, { 0x9c, 0xaa, 0xc2, 0x05, 0x1d, 0x5d, 0x46, 0xb0 } \\r
+  }\r
 #define EFI_ERROR_SECTION_PLATFORM_MEMORY_GUID \\r
   { \\r
     0xa5bc1114, 0x6f64, 0x4ede, { 0xb8, 0x63, 0x3e, 0x83, 0xed, 0x7c, 0x83, 0xb1 } \\r
@@ -243,6 +250,7 @@ typedef struct {
 ///@{\r
 #define EFI_GENERIC_ERROR_PROC_TYPE_IA32_X64         0x00\r
 #define EFI_GENERIC_ERROR_PROC_TYPE_IA64             0x01\r
+#define EFI_GENERIC_ERROR_PROC_TYPE_ARM              0x02\r
 ///@}\r
 \r
 ///\r
@@ -252,6 +260,8 @@ typedef struct {
 #define EFI_GENERIC_ERROR_PROC_ISA_IA32              0x00\r
 #define EFI_GENERIC_ERROR_PROC_ISA_IA64              0x01\r
 #define EFI_GENERIC_ERROR_PROC_ISA_X64               0x02\r
+#define EFI_GENERIC_ERROR_PROC_ISA_ARM_A32_T32       0x03\r
+#define EFI_GENERIC_ERROR_PROC_ISA_ARM_A64           0x04\r
 ///@}\r
 \r
 ///\r
@@ -333,6 +343,23 @@ typedef struct {
   }\r
 ///@}\r
 \r
+///\r
+/// The validation bit mask indicates which fields in the IA32/X64 Processor\r
+/// Error Record structure are valid.\r
+///@{\r
+#define EFI_IA32_X64_PROCESSOR_ERROR_APIC_ID_VALID         BIT0\r
+#define EFI_IA32_X64_PROCESSOR_ERROR_CPU_ID_INFO_VALID     BIT1\r
+///@}\r
+\r
+///\r
+/// IA32/X64 Processor Error Record\r
+///\r
+typedef struct {\r
+  UINT64             ValidFields;\r
+  UINT64             ApicId;\r
+  UINT8              CpuIdInfo[48];\r
+} EFI_IA32_X64_PROCESSOR_ERROR_RECORD;\r
+\r
 ///\r
 /// The validation bit mask indicates which fields in the Cache Check structure\r
 /// are valid.\r
@@ -1058,16 +1085,21 @@ typedef struct {
 \r
 ///\r
 /// Identifies the type of firmware error record\r
-///\r
+///@{\r
 #define EFI_FIRMWARE_ERROR_TYPE_IPF_SAL              0x00\r
+#define EFI_FIRMWARE_ERROR_TYPE_SOC_TYPE1            0x01\r
+#define EFI_FIRMWARE_ERROR_TYPE_SOC_TYPE2            0x02\r
+///@}\r
 \r
 ///\r
 /// Firmware Error Record Section\r
 ///\r
 typedef struct {\r
   UINT8       ErrorType;\r
-  UINT8       Resv1[7];\r
+  UINT8       Revision;\r
+  UINT8       Resv1[6];\r
   UINT64      RecordId;\r
+  EFI_GUID    RecordIdGuid;\r
 } EFI_FIRMWARE_ERROR_DATA;\r
 \r
 ///\r
@@ -1178,6 +1210,8 @@ extern EFI_GUID gEfiEventNotificationTypeDmarGuid;
 \r
 extern EFI_GUID gEfiProcessorGenericErrorSectionGuid;\r
 extern EFI_GUID gEfiProcessorSpecificErrorSectionGuid;\r
+extern EFI_GUID gEfiIa32X64ProcessorErrorSectionGuid;\r
+extern EFI_GUID gEfiArmProcessorErrorSectionGuid ;\r
 extern EFI_GUID gEfiPlatformMemoryErrorSectionGuid;\r
 extern EFI_GUID gEfiPlatformMemory2ErrorSectionGuid;\r
 extern EFI_GUID gEfiPcieErrorSectionGuid;\r