From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=217.140.106.55; helo=cam-smtp0.cambridge.arm.com; envelope-from=sami.mujawar@arm.com; receiver=edk2-devel@lists.01.org Received: from cam-smtp0.cambridge.arm.com (unknown [217.140.106.55]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 340F1211CFFCB for ; Tue, 26 Feb 2019 00:44:33 -0800 (PST) Received: from E107187.Arm.com (e107187.arm.com [10.1.195.55]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id x1Q8iSqw010007; Tue, 26 Feb 2019 08:44:30 GMT From: Sami Mujawar To: edk2-devel@lists.01.org Cc: lersek@redhat.com, alexei.fedorov@arm.com, leif.lindholm@linaro.org, Matteo.Carlini@arm.com, Stephanie.Hughes-Fitt@arm.com, nd@arm.com Date: Tue, 26 Feb 2019 08:44:19 +0000 Message-Id: <20190226084423.14024-3-sami.mujawar@arm.com> X-Mailer: git-send-email 2.11.0.windows.3 In-Reply-To: <20190226084423.14024-1-sami.mujawar@arm.com> References: <20190226084423.14024-1-sami.mujawar@arm.com> Subject: [PATCH v1 2/6] Revert "DynamicTablesPkg: Remove GIC Distributor Id field" X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 X-List-Received-Date: Tue, 26 Feb 2019 08:44:34 -0000 This reverts commit d3a15f435f9716aa2f2ea5e9b35fcda04f267ab4. Reverting this patch as Soft Feature Freeze for edk2-stable201903 started on 22 Feb 2019. Cc: Laszlo Ersek Cc: Alexei Fedorov Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Sami Mujawar --- DynamicTablesPkg/Include/ArmNameSpaceObjects.h | 5 ++++- 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 73139eb3273e89205ef9e6bee67b1b842f7f516b..2adaa788083e4e15d049f5f6b6312f77f3c02488 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 6b89c3f65d36ff35fcfc81cdffdeae8e4306c976..1ee0b9e006bfa00ea5bbf6aa64209dac244c90a0 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 -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'