sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "DynamicTablesPkg: Remove GIC Distributor Id field"

Browse Source 
This reverts commit d3a15f435f.

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>
This commit is contained in:
Sami Mujawar
2019-02-25 20:36:33 +00:00
parent 4c20a79133
commit 82c4426a17
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DynamicTablesPkg/Include/ArmNameSpaceObjects.h
View File

@@ -1,6 +1,6 @@
/** @file /** @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 This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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. GIC Distributor information for the Platform.
*/ */
typedef struct CmArmGicDInfo { typedef struct CmArmGicDInfo {
/// The GIC Distributor ID.
UINT32 GicId;
/// The Physical Base address for the GIC Distributor. /// The Physical Base address for the GIC Distributor.
UINT64 PhysicalBaseAddress; UINT64 PhysicalBaseAddress;

4
DynamicTablesPkg/Library/Acpi/Arm/AcpiMadtLibArm/MadtGenerator.c
View File

@@ -192,9 +192,7 @@ AddGICD (
// UINT16 Reserved // UINT16 Reserved
Gicd->Reserved1 = EFI_ACPI_RESERVED_WORD; Gicd->Reserved1 = EFI_ACPI_RESERVED_WORD;
// UINT32 Identifier // UINT32 Identifier
// One, and only one, GIC distributor structure must be present Gicd->GicId = GicDInfo->GicId;
// in the MADT for an ARM based system
Gicd->GicId = 0;
// UINT64 PhysicalBaseAddress // UINT64 PhysicalBaseAddress
Gicd->PhysicalBaseAddress = GicDInfo->PhysicalBaseAddress; Gicd->PhysicalBaseAddress = GicDInfo->PhysicalBaseAddress;
// UINT32 VectorBase // UINT32 VectorBase