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.73; 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-eopbgr70073.outbound.protection.outlook.com [40.107.7.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 69443211DB422 for ; Tue, 19 Mar 2019 06:48:02 -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=X7r/kkjbvnLSK+igckt0GrbTJ9AI3ZBgsEU5jV6oT+Q=; b=Ehm8MFinvUWg71XCCwpKGhOujuwyrwPdk/iukhqfsWzSMrrbHNYHxIiKb/tiEUts3/CzwN3F+vUc7u5R92mMxqE1SS75w06E57FjKvc1X93z8gtZ2wNGQzwyjIW1loMjvKGDD7GOsLy2TWQFR0TiITcmAK4XsjkVUyxStk3ujoE= Received: from VI1PR08CA0215.eurprd08.prod.outlook.com (2603:10a6:802:15::24) by VI1PR08MB3261.eurprd08.prod.outlook.com (2603:10a6:803:3d::16) 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:59 +0000 Received: from VE1EUR03FT006.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e09::200) by VI1PR08CA0215.outlook.office365.com (2603:10a6:802:15::24) 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:59 +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 VE1EUR03FT006.mail.protection.outlook.com (10.152.18.116) 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:59 +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:37 +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:37 +0000 From: Sami Mujawar To: CC: , , , , , Date: Tue, 19 Mar 2019 13:47:26 +0000 Message-ID: <20190319134726.95524-7-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)(346002)(376002)(136003)(396003)(2980300002)(189003)(199004)(53936002)(6916009)(2906002)(15650500001)(2351001)(97736004)(1076003)(305945005)(50226002)(16586007)(106002)(81156014)(81166006)(8676002)(51416003)(36756003)(76176011)(68736007)(7696005)(5660300002)(54906003)(47776003)(11346002)(478600001)(356004)(486006)(316002)(50466002)(8936002)(6666004)(2616005)(44832011)(72206003)(86362001)(446003)(126002)(19627235002)(336012)(426003)(106466001)(53416004)(186003)(476003)(4326008)(77096007)(26005)(48376002)(114624004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR08MB3261; 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: b760a4cd-4f33-497d-de60-08d6ac717fac 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:VI1PR08MB3261; X-MS-TrafficTypeDiagnostic: VI1PR08MB3261: NoDisclaimer: True X-Microsoft-Antispam-PRVS: X-Forefront-PRVS: 0981815F2F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: fqLlh7HI5DJBUWNDiPSg9xtJS8m5YB/2RgdfjjzdWUdo/s/tMlH4WEj2/EOfVcchiwjtpC4k6PJb6deidr9qnv3guKDBNA3wZrKD0q/t27En6UQQ+VVer3nIX3p+pJYewddxPlYGL+6ohfF7y53ckNMxfpLw9Spmj13AMU0+TWm6ewGVAHMEscgRUobtHPhIIkvw2LSiTexOhw4X+qVWnbUsrNxmJ8jTZ3pLFtiF/buarJZBs4ZilfaaYORFcEIBUsaRx5YQdwiY/mWw+Hgi2B6ciyeYKeHrMmHFwEETcjX7s41xFb28MJ9NwQI2JLlMgs9CRWKgwEUm4QyN/msVn/c/EAlQi8/Ijgtt951kUIvwK+o51aPUJthiLJlgIx8yKMSUxMZrD3msXNVOVcjWlg9ih2Hc0rUEfSPoWK9RwEo= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2019 13:47:59.1341 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b760a4cd-4f33-497d-de60-08d6ac717fac 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: VI1PR08MB3261 Subject: [PATCH v2 6/6] DynamicTablesPkg: Minor updates and fix typos 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:48:03 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:03 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:03 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:03 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:03 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:03 -0000 X-List-Received-Date: Tue, 19 Mar 2019 13:48:03 -0000 Content-Type: text/plain This patch was originally merged in edk2 master at 07f4e26eb6fe5203028ecfe9bad90d3b67dc72c8. However, this was later reverted at 4c20a7913333fdbd3b4c83dba060fefa84027313 as it was merged during the Soft Feature Freeze for edk2-stable201903. Resubmitting this patch as the edk2 merge window is now open. Minor updates to comments and typo fixes. Also removed unused structure CM_ARM_CPU_INFO_LIST. 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 | 66 ++++++++++++++++---- 1 file changed, 55 insertions(+), 11 deletions(-) diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h index 73139eb3273e89205ef9e6bee67b1b842f7f516b..ec31c40449d0658f98a89ce0bb6f604b491f1f34 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -59,6 +59,8 @@ typedef enum ArmObjectID { /** A structure that describes the ARM Boot Architecture flags. + + ID: EArmObjBootArchInfo */ typedef struct CmArmBootArchInfo { /** This is the ARM_BOOT_ARCH flags field of the FADT Table @@ -71,13 +73,10 @@ typedef struct CmArmCpuInfo { // Reserved for use when SMBIOS tables are implemented } CM_ARM_CPU_INFO; -typedef struct CmArmCpuInfoList { - UINT32 CpuCount; - CM_ARM_CPU_INFO * CpuInfo; -} CM_ARM_CPU_INFO_LIST; - /** A structure that describes the Power Management Profile Information for the Platform. + + ID: EArmObjPowerManagementProfileInfo */ typedef struct CmArmPowerManagementProfileInfo { /** This is the Preferred_PM_Profile field of the FADT Table @@ -88,6 +87,8 @@ typedef struct CmArmPowerManagementProfileInfo { /** A structure that describes the GIC CPU Interface for the Platform. + + ID: EArmObjGicCInfo */ typedef struct CmArmGicCInfo { /// The GIC CPU Interface number. @@ -164,6 +165,8 @@ typedef struct CmArmGicCInfo { /** A structure that describes the GIC Distributor information for the Platform. + + ID: EArmObjGicDInfo */ typedef struct CmArmGicDInfo { /// The Physical Base address for the GIC Distributor. @@ -184,6 +187,8 @@ typedef struct CmArmGicDInfo { /** A structure that describes the GIC MSI Frame information for the Platform. + + ID: EArmObjGicMsiFrameInfo */ typedef struct CmArmGicMsiFrameInfo { /// The GIC MSI Frame ID @@ -207,6 +212,8 @@ typedef struct CmArmGicMsiFrameInfo { /** A structure that describes the GIC Redistributor information for the Platform. + + ID: EArmObjGicRedistributorInfo */ typedef struct CmArmGicRedistInfo { /** The physical address of a page range @@ -220,6 +227,8 @@ typedef struct CmArmGicRedistInfo { /** A structure that describes the GIC Interrupt Translation Service information for the Platform. + + ID: EArmObjGicItsInfo */ typedef struct CmArmGicItsInfo { /// The GIC ITS ID @@ -231,6 +240,9 @@ typedef struct CmArmGicItsInfo { /** A structure that describes the Serial Port information for the Platform. + + ID: EArmObjSerialConsolePortInfo or + EArmObjSerialDebugPortInfo */ typedef struct CmArmSerialPortInfo { /// The physical base address for the serial port @@ -251,6 +263,8 @@ typedef struct CmArmSerialPortInfo { /** A structure that describes the Generic Timer information for the Platform. + + ID: EArmObjGenericTimerInfo */ typedef struct CmArmGenericTimerInfo { /// The physical base address for the counter control frame @@ -286,6 +300,8 @@ typedef struct CmArmGenericTimerInfo { /** A structure that describes the Platform Generic Block Timer Frame information for the Platform. + + ID: EArmObjGTBlockTimerFrameInfo */ typedef struct CmArmGTBlockTimerFrameInfo { /// The Generic Timer frame number @@ -321,6 +337,8 @@ typedef struct CmArmGTBlockTimerFrameInfo { /** A structure that describes the Platform Generic Block Timer information for the Platform. + + ID: EArmObjPlatformGTBlockInfo */ typedef struct CmArmGTBlockInfo { /// The physical base address for the GT Block Timer structure @@ -335,6 +353,8 @@ typedef struct CmArmGTBlockInfo { /** A structure that describes the SBSA Generic Watchdog information for the Platform. + + ID: EArmObjPlatformGenericWatchdogInfo */ typedef struct CmArmGenericWatchdogInfo { /// The physical base address of the SBSA Watchdog control frame @@ -354,6 +374,8 @@ typedef struct CmArmGenericWatchdogInfo { /** A structure that describes the PCI Configuration Space information for the Platform. + + ID: EArmObjPciConfigSpaceInfo */ typedef struct CmArmPciConfigSpaceInfo { /// The physical base address for the PCI segment @@ -371,6 +393,8 @@ typedef struct CmArmPciConfigSpaceInfo { /** A structure that describes the Hypervisor Vendor ID information for the Platform. + + ID: EArmObjHypervisorVendorIdentity */ typedef struct CmArmHypervisorVendorId { /// The hypervisor Vendor ID @@ -379,6 +403,8 @@ typedef struct CmArmHypervisorVendorId { /** A structure that describes the Fixed feature flags for the Platform. + + ID: EArmObjFixedFeatureFlags */ typedef struct CmArmFixedFeatureFlags { /// The Fixed feature flags @@ -387,9 +413,11 @@ typedef struct CmArmFixedFeatureFlags { /** A structure that describes the ITS Group node for the Platform. + + ID: EArmObjItsGroup */ typedef struct CmArmItsGroupNode { - /// An unique token used to ideintify this object + /// An unique token used to identify this object CM_OBJECT_TOKEN Token; /// The number of ITS identifiers in the ITS node UINT32 ItsIdCount; @@ -399,6 +427,8 @@ typedef struct CmArmItsGroupNode { /** A structure that describes the GIC ITS Identifiers for an ITS Group node. + + ID: EArmObjGicItsIdentifierArray */ typedef struct CmArmGicItsIdentifier { /// The ITS Identifier @@ -407,9 +437,11 @@ typedef struct CmArmGicItsIdentifier { /** A structure that describes the Named component node for the Platform. + + ID: EArmObjNamedComponent */ typedef struct CmArmNamedComponentNode { - /// An unique token used to ideintify this object + /// An unique token used to identify this object CM_OBJECT_TOKEN Token; /// Number of ID mappings UINT32 IdMappingCount; @@ -436,9 +468,11 @@ typedef struct CmArmNamedComponentNode { /** A structure that describes the Root complex node for the Platform. + + ID: EArmObjRootComplex */ typedef struct CmArmRootComplexNode { - /// An unique token used to ideintify this object + /// An unique token used to identify this object CM_OBJECT_TOKEN Token; /// Number of ID mappings UINT32 IdMappingCount; @@ -462,9 +496,11 @@ typedef struct CmArmRootComplexNode { /** A structure that describes the SMMUv1 or SMMUv2 node for the Platform. + + ID: EArmObjSmmuV1SmmuV2 */ typedef struct CmArmSmmuV1SmmuV2Node { - /// An unique token used to ideintify this object + /// An unique token used to identify this object CM_OBJECT_TOKEN Token; /// Number of ID mappings UINT32 IdMappingCount; @@ -502,9 +538,11 @@ typedef struct CmArmSmmuV1SmmuV2Node { /** A structure that describes the SMMUv3 node for the Platform. + + ID: EArmObjSmmuV3 */ typedef struct CmArmSmmuV3Node { - /// An unique token used to ideintify this object + /// An unique token used to identify this object CM_OBJECT_TOKEN Token; /// Number of ID mappings UINT32 IdMappingCount; @@ -536,9 +574,11 @@ typedef struct CmArmSmmuV3Node { /** A structure that describes the PMCG node for the Platform. + + ID: EArmObjPmcg */ typedef struct CmArmPmcgNode { - /// An unique token used to ideintify this object + /// An unique token used to identify this object CM_OBJECT_TOKEN Token; /// Number of ID mappings UINT32 IdMappingCount; @@ -558,6 +598,8 @@ typedef struct CmArmPmcgNode { /** A structure that describes the ID Mappings for the Platform. + + ID: EArmObjIdMappingArray */ typedef struct CmArmIdMapping { /// Input base @@ -574,6 +616,8 @@ typedef struct CmArmIdMapping { /** A structure that describes the SMMU interrupts for the Platform. + + ID: EArmObjSmmuInterruptArray */ typedef struct CmArmSmmuInterrupt { /// Interrupt number -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'