X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdePkg%2FInclude%2FIndustryStandard%2FAcpi51.h;h=034094ea28db050993eb7089841e1b5d0e4f8cdc;hb=5f87f979c6f5b05f97eab02f7e3c01fabeb839c6;hp=2741c4b80261e22153295445397c7ffe42bb968b;hpb=f449affebd12c64e5ae2338caa7993e0daa10712;p=mirror_edk2.git

diff --git a/MdePkg/Include/IndustryStandard/Acpi51.h b/MdePkg/Include/IndustryStandard/Acpi51.h
index 2741c4b802..034094ea28 100644
--- a/MdePkg/Include/IndustryStandard/Acpi51.h
+++ b/MdePkg/Include/IndustryStandard/Acpi51.h
@@ -1,7 +1,9 @@
 /** @file   
   ACPI 5.1 definitions from the ACPI Specification Revision 5.1 July, 2014.
 
-  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 Hewlett-Packard Development Company, L.P.<BR>
+  Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>
+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<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        
@@ -528,9 +530,18 @@ typedef struct {
   UINT32  GicId;
   UINT64  PhysicalBaseAddress;
   UINT32  SystemVectorBase;
-  UINT32  Reserved2;
+  UINT8   GicVersion;
+  UINT8   Reserved2[3];
 } EFI_ACPI_5_1_GIC_DISTRIBUTOR_STRUCTURE;
 
+///
+/// GIC Version
+///
+#define EFI_ACPI_5_1_GIC_V2                                   0x01
+#define EFI_ACPI_5_1_GIC_V2m                                  0x02
+#define EFI_ACPI_5_1_GIC_V3                                   0x03
+#define EFI_ACPI_5_1_GIC_V4                                   0x04
+
 ///
 /// GIC MSI Frame Structure
 ///
@@ -611,12 +622,13 @@ typedef struct {
 
 //
 // SRAT structure types.
-// All other values between 0x03 an 0xFF are reserved and
+// All other values between 0x04 an 0xFF are reserved and
 // will be ignored by OSPM.
 //
 #define EFI_ACPI_5_1_PROCESSOR_LOCAL_APIC_SAPIC_AFFINITY  0x00
 #define EFI_ACPI_5_1_MEMORY_AFFINITY                      0x01
 #define EFI_ACPI_5_1_PROCESSOR_LOCAL_X2APIC_AFFINITY      0x02
+#define EFI_ACPI_5_1_GICC_AFFINITY                        0x03
 
 ///
 /// Processor Local APIC/SAPIC Affinity Structure Definition
@@ -675,6 +687,23 @@ typedef struct {
   UINT8   Reserved2[4];
 } EFI_ACPI_5_1_PROCESSOR_LOCAL_X2APIC_AFFINITY_STRUCTURE;
 
+///
+/// GICC Affinity Structure Definition
+///
+typedef struct {
+  UINT8   Type;
+  UINT8   Length;
+  UINT32  ProximityDomain;
+  UINT32  AcpiProcessorUid;
+  UINT32  Flags;
+  UINT32  ClockDomain;
+} EFI_ACPI_5_1_GICC_AFFINITY_STRUCTURE;
+
+///
+/// GICC Flags.  All other bits are reserved and must be 0.
+///
+#define EFI_ACPI_5_1_GICC_ENABLED (1 << 0)
+
 ///
 /// System Locality Distance Information Table (SLIT).
 /// The rest of the table is a matrix.
@@ -1238,7 +1267,7 @@ typedef struct {
 ///
 /// GTDT Version (as defined in ACPI 5.1 spec.)
 ///
-#define EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION 0x01
+#define EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION 0x02
 
 ///
 /// Timer Flags.  All other bits are reserved and must be 0.
@@ -1297,8 +1326,8 @@ typedef struct {
 ///
 typedef struct {
   UINT8   Type;
-  UINT8   Length;
-  UINT16  Reserved;
+  UINT16  Length;
+  UINT8   Reserved;
   UINT64  RefreshFramePhysicalAddress;
   UINT64  WatchdogControlFramePhysicalAddress;
   UINT32  WatchdogTimerGSIV;
@@ -1845,7 +1874,8 @@ typedef struct {
   UINT8                                    CommandComplete:1;
   UINT8                                    SciDoorbell:1;
   UINT8                                    Error:1;
-  UINT8                                    Reserved:5;
+  UINT8                                    PlatformNotification:1;  
+  UINT8                                    Reserved:4;
   UINT8                                    Reserved1;
 } EFI_ACPI_5_1_PCCT_GENERIC_SHARED_MEMORY_REGION_STATUS;