From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=40.107.7.87; helo=eur04-he1-obe.outbound.protection.outlook.com; envelope-from=sami.mujawar@arm.com; receiver=edk2-devel@lists.01.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70087.outbound.protection.outlook.com [40.107.7.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 90FA5211DB422 for ; Tue, 19 Mar 2019 06:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=F3SkDYXytyHqeaiutERLJVrVgWEfyp1wNj4TTdrhdqs=; b=N4FbGSJkowoLX5tzuPiG4ib9ewkaGo+DgEVAV3g+bd812B0LC4DDKc83aMoLjAKDx5m3jJE+ZtrJeqtQBdJhEqdq+veWdj2hF4ZikSFX10NDNLKU44uAGCsOV8RVBTPTRWmcxC6oU3jNyHkmFSsx1KG23Psq3Mqy5aPiu/j2m2A= Received: from DB6PR0802CA0028.eurprd08.prod.outlook.com (2603:10a6:4:a3::14) by DB5PR0801MB1478.eurprd08.prod.outlook.com (2603:10a6:0:3a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.13; Tue, 19 Mar 2019 13:47:37 +0000 Received: from VE1EUR03FT015.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::205) by DB6PR0802CA0028.outlook.office365.com (2603:10a6:4:a3::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1709.13 via Frontend Transport; Tue, 19 Mar 2019 13:47:37 +0000 Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by VE1EUR03FT015.mail.protection.outlook.com (10.152.18.176) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.1730.9 via Frontend Transport; Tue, 19 Mar 2019 13:47:37 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1415.2; Tue, 19 Mar 2019 13:47:35 +0000 Received: from E107187.Arm.com (10.1.195.55) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Tue, 19 Mar 2019 13:47:35 +0000 From: Sami Mujawar To: CC: , , , , , Date: Tue, 19 Mar 2019 13:47:22 +0000 Message-ID: <20190319134726.95524-3-sami.mujawar@arm.com> X-Mailer: git-send-email 2.11.0.windows.3 In-Reply-To: <20190319134726.95524-1-sami.mujawar@arm.com> References: <20190319134726.95524-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:40.67.248.234; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(396003)(136003)(376002)(346002)(2980300002)(189003)(199004)(106002)(77096007)(53936002)(50466002)(54906003)(44832011)(426003)(2616005)(53416004)(26005)(356004)(48376002)(7696005)(51416003)(5660300002)(6666004)(476003)(2906002)(486006)(126002)(86362001)(47776003)(336012)(97736004)(446003)(8936002)(11346002)(50226002)(186003)(2351001)(16586007)(1076003)(81166006)(106466001)(316002)(81156014)(8676002)(6916009)(4326008)(76176011)(72206003)(305945005)(36756003)(68736007)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR0801MB1478; H:nebula.arm.com; FPR:; SPF:Pass; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3a60f8b4-6feb-4b25-c0f4-08d6ac717281 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4608103)(4709054)(2017052603328)(7153060); SRVR:DB5PR0801MB1478; X-MS-TrafficTypeDiagnostic: DB5PR0801MB1478: NoDisclaimer: True X-Microsoft-Antispam-PRVS: X-Forefront-PRVS: 0981815F2F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: /swJ/Z19wViypW0pOHl2EK1NVU19p9uQJA+Zy3mbgMVDMcIxfbl0UlzFHu4dblYlND+KZsF6Yy7m97vsrJRlhqgwoHNg3PpuGHHHhJnlcvRV/EiLCA7LHHYJdwdcLW/jjAPn2wDYnGlJBhn9KMJtFl0ZR/pzP/uENg6YCB2a8QZkqCrmyi8sVLZOvBP10iAc4HSWM8+TmERCXe42tUjDQZoOCfs7PvwpwuaH1C8y2xbUr0Pa0dF18KF3X0uOqtG8ioGmu8+hPsyvQVNxFYoo9BgSkuQEW+Jhxp7cYj//T6o+0dIQ2Y0K0hytQUMHvDz7GcPrxBudNjEVwc8RStptcIaH9Wjw4m9jms1wercSY2YAWarMTDZLqIwt5kq0P0csHvJ2ul8uhC4DPruPpTeANc/D1RsCz+j2Qrfz7ZlNDbM= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2019 13:47:37.0570 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3a60f8b4-6feb-4b25-c0f4-08d6ac717281 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[40.67.248.234]; Helo=[nebula.arm.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR0801MB1478 Subject: [PATCH v2 2/6] 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, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:47:41 -0000 Content-Type: text/plain 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 Cc: Alexei Fedorov Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Sami Mujawar Reviewed-by: Alexei Fedorov --- 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)'