This patch was originally merged in edk2 master at 1d49a75367ef6827b8b8f77f61e9ce245d1bdee3. However, this was later reverted at 334111b0dab80394aeb1ebb8f0f3314847e2dc1f as it was merged during the Soft Feature Freeze for edk2-stable201903.
Resubmitting this patch as the edk2 merge window is now open. Renamed the enum EArmObjIdMapping to EArmObjIdMappingArray and updated the IORT generator accordingly. Cc: Laszlo Ersek <ler...@redhat.com> Cc: Alexei Fedorov <alexei.fedo...@arm.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Sami Mujawar <sami.muja...@arm.com> Reviewed-by: Alexei Fedorov <alexei.fedo...@arm.com> --- 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 93cb6949f0eb2ac2ad3524494e4a14c7a6fab4b8..2adaa788083e4e15d049f5f6b6312f77f3c02488 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 - EArmObjIdMapping, ///< 25 - ID Mapping + EArmObjIdMappingArray, ///< 25 - ID Mapping Array 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 a3ee60664ecbeb1b12b01683f838e11804884daf..b53c4bb47798d4ad441db1fe1b1e5b180e313403 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 - - EArmObjIdMapping + - EArmObjIdMappingArray - EArmObjGicItsIdentifierArray */ @@ -116,7 +116,7 @@ GET_OBJECT_LIST ( */ GET_OBJECT_LIST ( EObjNameSpaceArm, - EArmObjIdMapping, + EArmObjIdMappingArray, CM_ARM_ID_MAPPING ); @@ -653,7 +653,7 @@ AddIdMappingArray ( Generator = (ACPI_IORT_GENERATOR*)This; // Get the Id Mapping Array - Status = GetEArmObjIdMapping ( + Status = GetEArmObjIdMappingArray ( CfgMgrProtocol, IdMappingToken, &IdMappings, -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel