summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamer El-Haj-Mahmoud <elhaj@hpe.com>2015-12-16 00:55:29 +0000
committerjyao1 <jyao1@Edk2>2015-12-16 00:55:29 +0000
commit8a2270a6ce2664fa8e727b391e7f06ac7ba39434 (patch)
tree04dc17f1dbf5dbbefe9ff9eaf6c8e300f0f370b8
parentb303605e1b7e113b4311daf161c6c3289350447b (diff)
downloadedk2-8a2270a6ce2664fa8e727b391e7f06ac7ba39434.tar.gz
edk2-8a2270a6ce2664fa8e727b391e7f06ac7ba39434.tar.bz2
edk2-8a2270a6ce2664fa8e727b391e7f06ac7ba39434.zip
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
-rw-r--r--MdePkg/Include/IndustryStandard/Acpi51.h12
-rw-r--r--MdePkg/Include/IndustryStandard/Acpi60.h12
2 files changed, 22 insertions, 2 deletions
diff --git a/MdePkg/Include/IndustryStandard/Acpi51.h b/MdePkg/Include/IndustryStandard/Acpi51.h
index 9e643bc376..034094ea28 100644
--- a/MdePkg/Include/IndustryStandard/Acpi51.h
+++ b/MdePkg/Include/IndustryStandard/Acpi51.h
@@ -3,6 +3,7 @@
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
@@ -529,10 +530,19 @@ 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
///
typedef struct {
diff --git a/MdePkg/Include/IndustryStandard/Acpi60.h b/MdePkg/Include/IndustryStandard/Acpi60.h
index 3dac3166ac..f0e4151fe4 100644
--- 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.
Copyright (c) 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
@@ -532,10 +533,19 @@ typedef struct {
UINT32 GicId;
UINT64 PhysicalBaseAddress;
UINT32 SystemVectorBase;
- UINT32 Reserved2;
+ UINT8 GicVersion;
+ UINT8 Reserved2[3];
} EFI_ACPI_6_0_GIC_DISTRIBUTOR_STRUCTURE;
///
+/// GIC Version
+///
+#define EFI_ACPI_6_0_GIC_V1 0x01
+#define EFI_ACPI_6_0_GIC_V2 0x02
+#define EFI_ACPI_6_0_GIC_V3 0x03
+#define EFI_ACPI_6_0_GIC_V4 0x04
+
+///
/// GIC MSI Frame Structure
///
typedef struct {