MdePkg: Add GIC version to ACPI 5.1/6 definitions

The GicVersion field is defined in ACPI 5.1 and 6.0

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: "Samer El-Haj-Mahmoud" <elhaj@hpe.com>
Reviewed-by: "Yao, Jiewen" <jiewen.yao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19288 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/IndustryStandard/Acpi51.h b/MdePkg/Include/IndustryStandard/Acpi51.h
index 9e643bc376f8b1b17c857b3b399c02172fa11bb2..034094ea28db050993eb7089841e1b5d0e4f8cdc 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi51.h
+++ b/MdePkg/Include/IndustryStandard/Acpi51.h
@@ -3,6 +3,7 @@
 \r
   Copyright (c) 2014 Hewlett-Packard Development Company, L.P.<BR>\r
   Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>\r
 \r
   Copyright (c) 2014 Hewlett-Packard Development Company, L.P.<BR>\r
   Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>\r

+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<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
   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


@@ -529,9 +530,18 @@ typedef struct {
   UINT32  GicId;\r
   UINT64  PhysicalBaseAddress;\r
   UINT32  SystemVectorBase;\r
   UINT32  GicId;\r
   UINT64  PhysicalBaseAddress;\r
   UINT32  SystemVectorBase;\r

-  UINT32  Reserved2;\r
+  UINT8   GicVersion;\r
+  UINT8   Reserved2[3];\r

 } EFI_ACPI_5_1_GIC_DISTRIBUTOR_STRUCTURE;\r
 \r
 } EFI_ACPI_5_1_GIC_DISTRIBUTOR_STRUCTURE;\r
 \r

+///\r
+/// GIC Version\r
+///\r
+#define EFI_ACPI_5_1_GIC_V2                                   0x01\r
+#define EFI_ACPI_5_1_GIC_V2m                                  0x02\r
+#define EFI_ACPI_5_1_GIC_V3                                   0x03\r
+#define EFI_ACPI_5_1_GIC_V4                                   0x04\r
+\r

 ///\r
 /// GIC MSI Frame Structure\r
 ///\r
 ///\r
 /// GIC MSI Frame Structure\r
 ///\r

diff --git a/MdePkg/Include/IndustryStandard/Acpi60.h b/MdePkg/Include/IndustryStandard/Acpi60.h
index 3dac3166ac6181d80a1d561db22a57efa6054631..f0e4151fe4b0473c0e7533fef8a6e9ffb838712e 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Acpi60.h
+++ b/MdePkg/Include/IndustryStandard/Acpi60.h
@@ -2,6 +2,7 @@
   ACPI 6.0 definitions from the ACPI Specification Revision 6.0 April, 2015.\r
 \r
   Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
   ACPI 6.0 definitions from the ACPI Specification Revision 6.0 April, 2015.\r
 \r
   Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r

+ (C) Copyright 2015 Hewlett Packard Enterprise Development LP<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
   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


@@ -532,9 +533,18 @@ typedef struct {
   UINT32  GicId;\r
   UINT64  PhysicalBaseAddress;\r
   UINT32  SystemVectorBase;\r
   UINT32  GicId;\r
   UINT64  PhysicalBaseAddress;\r
   UINT32  SystemVectorBase;\r

-  UINT32  Reserved2;\r
+  UINT8   GicVersion;\r
+  UINT8   Reserved2[3];\r

 } EFI_ACPI_6_0_GIC_DISTRIBUTOR_STRUCTURE;\r
 \r
 } EFI_ACPI_6_0_GIC_DISTRIBUTOR_STRUCTURE;\r
 \r

+///\r
+/// GIC Version\r
+///\r
+#define EFI_ACPI_6_0_GIC_V1                                   0x01\r
+#define EFI_ACPI_6_0_GIC_V2                                   0x02\r
+#define EFI_ACPI_6_0_GIC_V3                                   0x03\r
+#define EFI_ACPI_6_0_GIC_V4                                   0x04\r
+\r

 ///\r
 /// GIC MSI Frame Structure\r
 ///\r
 ///\r
 /// GIC MSI Frame Structure\r
 ///\r