diff options
| author | Sami Mujawar <sami.mujawar@arm.com> | 2019-02-25 20:36:33 +0000 |
|---|---|---|
| committer | Sami Mujawar <sami.mujawar@arm.com> | 2019-02-26 08:53:28 +0000 |
| commit | 82c4426a176c271d24915b403b267a431bdc52f5 (patch) | |
| tree | 7715c510ac5b27a0b824f46d2ffdba4abbfa8388 | |
| parent | 4c20a7913333fdbd3b4c83dba060fefa84027313 (diff) | |
| download | edk2-82c4426a176c271d24915b403b267a431bdc52f5.tar.gz edk2-82c4426a176c271d24915b403b267a431bdc52f5.tar.bz2 edk2-82c4426a176c271d24915b403b267a431bdc52f5.zip | |
Revert "DynamicTablesPkg: Remove GIC Distributor Id field"
This reverts commit d3a15f435f9716aa2f2ea5e9b35fcda04f267ab4.
Reverting this patch as Soft Feature Freeze for
edk2-stable201903 started on 22 Feb 2019.
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Alexei Fedorov <alexei.fedorov@arm.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Alexei Fedorov <alexei.fedorov@arm.com>
| -rw-r--r-- | DynamicTablesPkg/Include/ArmNameSpaceObjects.h | 5 | ||||
| -rw-r--r-- | DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h index 73139eb327..2adaa78808 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -1,6 +1,6 @@ /** @file
- Copyright (c) 2017 - 2019, ARM Limited. All rights reserved.
+ Copyright (c) 2017 - 2018, ARM Limited. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -166,6 +166,9 @@ typedef struct CmArmGicCInfo { GIC Distributor information for the Platform.
*/
typedef struct CmArmGicDInfo {
+ /// The GIC Distributor ID.
+ UINT32 GicId;
+
/// The Physical Base address for the GIC Distributor.
UINT64 PhysicalBaseAddress;
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c index 6b89c3f65d..1ee0b9e006 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c @@ -192,9 +192,7 @@ AddGICD ( // UINT16 Reserved
Gicd->Reserved1 = EFI_ACPI_RESERVED_WORD;
// UINT32 Identifier
- // One, and only one, GIC distributor structure must be present
- // in the MADT for an ARM based system
- Gicd->GicId = 0;
+ Gicd->GicId = GicDInfo->GicId;
// UINT64 PhysicalBaseAddress
Gicd->PhysicalBaseAddress = GicDInfo->PhysicalBaseAddress;
// UINT32 VectorBase
|