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 35ABC2194EB7D 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 x1Q8iSr1010007; 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:22 +0000 Message-Id: <20190226084423.14024-6-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 5/6] Revert "DynamicTablesPkg: Rename enum used for ID Mapping" 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 This reverts commit 1d49a75367ef6827b8b8f77f61e9ce245d1bdee3. 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 | 2 +- DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h index 2adaa788083e4e15d049f5f6b6312f77f3c02488..93cb6949f0eb2ac2ad3524494e4a14c7a6fab4b8 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -52,7 +52,7 @@ typedef enum ArmObjectID { EArmObjSmmuV3, ///< 22 - SMMUv3 EArmObjPmcg, ///< 23 - PMCG EArmObjGicItsIdentifierArray, ///< 24 - GIC ITS Identifier Array - EArmObjIdMappingArray, ///< 25 - ID Mapping Array + EArmObjIdMapping, ///< 25 - ID Mapping EArmObjSmmuInterruptArray, ///< 26 - SMMU Interrupt Array EArmObjMax } EARM_OBJECT_ID; diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c index b53c4bb47798d4ad441db1fe1b1e5b180e313403..a3ee60664ecbeb1b12b01683f838e11804884daf 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c @@ -44,7 +44,7 @@ Requirements: - EArmObjSmmuV3 - EArmObjPmcg - EArmObjGicItsIdentifierArray - - EArmObjIdMappingArray + - EArmObjIdMapping - EArmObjGicItsIdentifierArray */ @@ -116,7 +116,7 @@ GET_OBJECT_LIST ( */ GET_OBJECT_LIST ( EObjNameSpaceArm, - EArmObjIdMappingArray, + EArmObjIdMapping, CM_ARM_ID_MAPPING ); @@ -653,7 +653,7 @@ AddIdMappingArray ( Generator = (ACPI_IORT_GENERATOR*)This; // Get the Id Mapping Array - Status = GetEArmObjIdMappingArray ( + Status = GetEArmObjIdMapping ( CfgMgrProtocol, IdMappingToken, &IdMappings, -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'