From nobody Mon Apr 29 02:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+70682+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1611322193621565.3546816598331; Fri, 22 Jan 2021 05:29:53 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZFH3YY1788612xrEFvK7ky9O; Fri, 22 Jan 2021 05:29:53 -0800 X-Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.61]) by mx.groups.io with SMTP id smtpd.web10.8664.1611322192080664878 for ; Fri, 22 Jan 2021 05:29:52 -0800 X-Received: from AM6P191CA0005.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8b::18) by AM0PR08MB4162.eurprd08.prod.outlook.com (2603:10a6:208:12a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.13; Fri, 22 Jan 2021 13:29:49 +0000 X-Received: from AM5EUR03FT010.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:8b:cafe::2f) by AM6P191CA0005.outlook.office365.com (2603:10a6:209:8b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.11 via Frontend Transport; Fri, 22 Jan 2021 13:29:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+70682+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT010.mail.protection.outlook.com (10.152.16.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.11 via Frontend Transport; Fri, 22 Jan 2021 13:29:48 +0000 X-Received: ("Tessian outbound e989e14f9207:v71"); Fri, 22 Jan 2021 13:29:48 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 365f7c537a2fb700 X-CR-MTA-TID: 64aa7808 X-Received: from fbe6d546cf5b.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 5420BE31-543A-4EBD-9A7C-2F7E97B3BE96.1; Fri, 22 Jan 2021 13:29:41 +0000 X-Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id fbe6d546cf5b.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 22 Jan 2021 13:29:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bpnUvpBcxc+5Kr60bk++y2xFZ8XDREHd5ZbW6M9IdxK/ORTlR2HJ6G8kEMCmgPf4qVy3+MBBOgj1VOf7jfOALZHU+EyX2CHcrOYEFQ2u6MsrMz86nRsmHzIE7uTxfYuCz+OYpnDpMQW8qqpjvKkmWwgjwivLNc4b3qovkTCGieHo1MU0WFk2LffKFH1kOtJsEnS6nMd1xHhxP9POwU9p0N187FRwWMfqKEYc7OFBBqgDgtngC661/hWGnPsFqS96zO2XC9KXrv0Flk73tDndtI2wKof3EODFU7IOXTL9iSNbFNEnX9DW6QLZLwq08T+4nU+kwRpzu4Gd4C+HEnD0Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Aw7W1CNbdRFtdj4bsVD4IoV1PMdHrbygm6FkLPdrXU0=; b=h300EW8raMLqDbfO7ATIQYZuTTxbcUXSzb8dab+BVoa4CXYH8d6a30oPGlCUMhqO61mEYA663vGbvfVQgus0X6fRoAnQF4k/qk5ZK/97LD+fowcwEAGV2MqY8jwqdquaQvqtySa714omQcD4ynXgMju0I87KWQqcAqJShtcZO2AVJrM5MOGdrdOIwF8l5HSmRDnWbB+CqjQ8J2zpqvwg7JP6iUCv6h0WKPsIrXDZx+7A05wnqDcTFXFbvT7lPTOQMMQXGLahoNiZdkv6A9xtczuXRlZanAYNA3E3zr2PY64i06ELtNDIXGf3Efy6JFS406SDQCKOvcYP8GjA/cTIuQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from DB6PR0202CA0024.eurprd02.prod.outlook.com (2603:10a6:4:29::34) by VI1PR0801MB1757.eurprd08.prod.outlook.com (2603:10a6:800:5a::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.13; Fri, 22 Jan 2021 13:29:39 +0000 X-Received: from DB5EUR03FT005.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:29:cafe::dc) by DB6PR0202CA0024.outlook.office365.com (2603:10a6:4:29::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Fri, 22 Jan 2021 13:29:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass 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; X-Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT005.mail.protection.outlook.com (10.152.20.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3784.11 via Frontend Transport; Fri, 22 Jan 2021 13:29:38 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) 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.2044.4; Fri, 22 Jan 2021 13:29:37 +0000 X-Received: from E107187.Arm.com (10.57.3.168) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2044.4 via Frontend Transport; Fri, 22 Jan 2021 13:29:36 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , Subject: [edk2-devel] [PATCH edk2-platforms v1 1/6] Platform/ARM: FVP: Remove usage of function macros Date: Fri, 22 Jan 2021 13:29:30 +0000 Message-ID: <20210122132935.22484-2-sami.mujawar@arm.com> In-Reply-To: <20210122132935.22484-1-sami.mujawar@arm.com> References: <20210122132935.22484-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f49fddb9-bde4-4a46-9873-08d8bed9ca70 X-MS-TrafficTypeDiagnostic: VI1PR0801MB1757:|AM0PR08MB4162: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:1923;OLM:1923; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: kCrP0Kmy9P7kTUNQ2znLz0kkylIZ9vJzJUihX9TMCa5TYFSXBklrUND8yz2ia4/x4QLBlKme8BflAImdyAb9zzDK+6VMtGDoxE8561YLHh+CUaKddqNFcFBbAy8NOd4XnL6XtfwdKLYoE/N3DIbeiDfjGG/u6AiEnvov7U6oboF9fa5htJDpDsTICUlvhe0Q77Uurd7CfhVbuTicz8Lj6zssv1Z95TUTiftgVy4s2iLR2u2BJmVsA8Z7nz7sBsSG+v0k1mNj0pzIdW3OxgXzyBVf747M2fKIz2EqodgwmE3dL0c0/z3I/plkvkpjISpnL9ThEcln2PGWZEEEQAd1Hix20ljtOLwhYCd7d7tfo17pMI6bpqEYWN3VVErfdsEWwGkMtaVtknXGxmm65/kwKKB6ZWT3K6pAfQOFohSAA1pq1YLkEK103l/bj3l3ZmLnsJ63oFFspJbliac3k/Fti/3wBH3+7iO++XlFAMUCjpXBxVqNzH/WcShTwJ0xcdqneuIdB5Cv2I0Xy5rP9SwCk2YJPgu2PwYg48qe61ZPrbwrKlciSxCW7aD3sMFJOCF0 X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(136003)(396003)(376002)(39840400004)(346002)(46966006)(6666004)(30864003)(44832011)(83380400001)(82310400003)(81166007)(6916009)(54906003)(4326008)(478600001)(356005)(2906002)(70206006)(47076005)(316002)(1076003)(5660300002)(36756003)(966005)(70586007)(8676002)(86362001)(2616005)(336012)(426003)(7696005)(26005)(8936002)(186003)(36610700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1757 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT010.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 6e686702-5bc4-4f8c-32d0-08d8bed9c499 X-Microsoft-Antispam-Message-Info: jBjz+ctp5bJOTcZPkFAxhy5GN4h2TD9bRCVGTvBh91t9vhFkkaug0Cw85dm10QkGKis2b7fwseKLBsmYfXEtfmk5Et1ifif8ThIER2gdfTy9doUDRRcZuAfzGWezN/SjuTq2yejTQsqcajqKFO4TFiZmNmC3seS+eZGCzwdJPYSiY4GEkeKO/trkLrZOHOlEPdu2pHrCTQUjChFdtjFqGjGk7DsBOttvBMlfZQPCY+mWI1i/l39ZpU9Bnc8vCo7nbjt2fjNXYlNAqVLHlEoorYgyYGA8KTGza33B+0pEsXfTXEKdtA9u9jWVFApbaE8hhU8fq6XBbT3v1ctUBtmvDKFhdSwXVoD4pj8G/vCadc6zM34RLVitSoab44X0h8v9sj6lmoeey2in/FF/QYJ1cMsA4bLj9HeSm7t50IYaBIo66zPvUF9eYi5qeyBcIoIitXqWo7Kxf7weD97FaP9+Dl9alkwdqrpQVH3jRG5QPbdS06pM3bdnufC/d3aHQUx+rRt1qdGgkQ1INv+ox+GFeqg1donZO4sCJWzueRi8pR4= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2021 13:29:48.5612 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f49fddb9-bde4-4a46-9873-08d8bed9ca70 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT010.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB4162 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,sami.mujawar@arm.com X-Gm-Message-State: wnBWEqZzs0gbRmt49MKbqWW5x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1611322193; bh=lmM1XutHEGZE6PjYNPHr2toF/SM1CjZmG1iXr1wsO88=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=V33U3njIs8Wdz7viZiZT2RlMrTbt3lgJbkgN9dDPTutvIyujXnq87uTOKHXOPCsYB5w 4KRLiahN6M5+/gdpIKGwSf13f3F+dvNT91ixpsYzxMc33pl0DCQhYuQXNFY7TNuFCq/+X 0hsdMMdwQkRTQGT9OAgD5Ounq04Hd+9Wmz8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The Configuration Manager code for FVP uses function macros to prepare and return CM objects. However, according to section 5.5.2.1 of the edk2 coding standard, use of functional macros is not allowed. See https://edk2-docs.gitbook.io/edk-ii-c-coding-standards-specification/ 5_source_files/55_preprocessor_directives#5-5-2-1-functional-macros-are- generally-discouraged Therefore, replace the function macros with static helper functions. Signed-off-by: Sami Mujawar Reviewed-by: Leif Lindholm --- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Conf= igurationManager.c | 347 ++++++++++++++------ Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Conf= igurationManager.h | 73 +--- 2 files changed, 266 insertions(+), 154 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/ConfigurationManager.c b/Platform/ARM/VExpressPkg/ConfigurationMana= ger/ConfigurationManagerDxe/ConfigurationManager.c index a48eb0285c60177078324bdbcd8fa29c308e6a13..3298f9f9f79a2b23f181d3e9612= 98f1c366976ee 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.c +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.c @@ -1,7 +1,7 @@ /** @file Configuration Manager Dxe =20 - Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.
+ Copyright (c) 2017 - 2021, Arm Limited. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -219,6 +219,98 @@ EDKII_PLATFORM_REPOSITORY_INFO VExpressPlatRepositoryI= nfo =3D { } }; =20 +/** A helper function for returning the Configuration Manager Objects. + + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Object Pointer to the Object(s). + @param [in] ObjectSize Total size of the Object(s). + @param [in] ObjectCount Number of Objects. + @param [in, out] CmObjectDesc Pointer to the Configuration Manager Ob= ject + descriptor describing the requested Obj= ect. + + @retval EFI_SUCCESS Success. +**/ +STATIC +EFI_STATUS +EFIAPI +HandleCmObject ( + IN CONST CM_OBJECT_ID CmObjectId, + IN VOID * Object, + IN CONST UINTN ObjectSize, + IN CONST UINTN ObjectCount, + IN OUT CM_OBJ_DESCRIPTOR * CONST CmObjectDesc + ) +{ + CmObjectDesc->ObjectId =3D CmObjectId; + CmObjectDesc->Size =3D ObjectSize; + CmObjectDesc->Data =3D (VOID*)Object; + CmObjectDesc->Count =3D ObjectCount; + DEBUG (( + DEBUG_INFO, + "INFO: CmObjectId =3D %x, Ptr =3D 0x%p, Size =3D %d, Count =3D %d\n", + CmObjectId, + CmObjectDesc->Data, + CmObjectDesc->Size, + CmObjectDesc->Count + )); + return EFI_SUCCESS; +} + +/** A helper function for returning the Configuration Manager Objects that + match the token. + + @param [in] This Pointer to the Configuration Manager Pro= tocol. + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Object Pointer to the Object(s). + @param [in] ObjectSize Total size of the Object(s). + @param [in] ObjectCount Number of Objects. + @param [in] Token A token identifying the object. + @param [in] HandlerProc A handler function to search the object + referenced by the token. + @param [in, out] CmObjectDesc Pointer to the Configuration Manager Obj= ect + descriptor describing the requested Obje= ct. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER A parameter is invalid. + @retval EFI_NOT_FOUND The required object information is not fou= nd. +**/ +STATIC +EFI_STATUS +EFIAPI +HandleCmObjectRefByToken ( + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST This, + IN CONST CM_OBJECT_ID CmObjectId, + IN VOID * Object, + IN CONST UINTN ObjectSize, + IN CONST UINTN ObjectCount, + IN CONST CM_OBJECT_TOKEN Token, + IN CONST CM_OBJECT_HANDLER_PROC HandlerProc, + IN OUT CM_OBJ_DESCRIPTOR * CONST CmObjectDesc + ) +{ + EFI_STATUS Status; + CmObjectDesc->ObjectId =3D CmObjectId; + if (Token =3D=3D CM_NULL_TOKEN) { + CmObjectDesc->Size =3D ObjectSize; + CmObjectDesc->Data =3D (VOID*)Object; + CmObjectDesc->Count =3D ObjectCount; + Status =3D EFI_SUCCESS; + } else { + Status =3D HandlerProc (This, CmObjectId, Token, CmObjectDesc); + } + + DEBUG (( + DEBUG_INFO, + "INFO: Token =3D 0x%p, CmObjectId =3D %x, Ptr =3D 0x%p, Size =3D %d, C= ount =3D %d\n", + (VOID*)Token, + CmObjectId, + CmObjectDesc->Data, + CmObjectDesc->Size, + CmObjectDesc->Count + )); + return Status; +} + /** Initialize the platform configuration repository. =20 @param [in] This Pointer to the Configuration Manager Protocol. @@ -304,28 +396,36 @@ GetStandardNameSpaceObject ( EFI_STATUS Status; EDKII_PLATFORM_REPOSITORY_INFO * PlatformRepo; =20 - Status =3D EFI_SUCCESS; if ((This =3D=3D NULL) || (CmObject =3D=3D NULL)) { ASSERT (This !=3D NULL); ASSERT (CmObject !=3D NULL); return EFI_INVALID_PARAMETER; } + + Status =3D EFI_NOT_FOUND; PlatformRepo =3D This->PlatRepoInfo; =20 switch (GET_CM_OBJECT_ID (CmObjectId)) { - HANDLE_CM_OBJECT ( - EStdObjCfgMgrInfo, - CmObjectId, - PlatformRepo->CmInfo, - 1 - ); - HANDLE_CM_OBJECT ( - EStdObjAcpiTableList, - CmObjectId, - PlatformRepo->CmAcpiTableList, - (sizeof (PlatformRepo->CmAcpiTableList) / - sizeof (PlatformRepo->CmAcpiTableList[0])) - ); + case EStdObjCfgMgrInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->CmInfo, + sizeof (PlatformRepo->CmInfo), + 1, + CmObject + ); + break; + + case EStdObjAcpiTableList: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->CmAcpiTableList, + sizeof (PlatformRepo->CmAcpiTableList), + ARRAY_SIZE (PlatformRepo->CmAcpiTableList), + CmObject + ); + break; + default: { Status =3D EFI_NOT_FOUND; DEBUG (( @@ -366,100 +466,149 @@ GetArmNameSpaceObject ( EFI_STATUS Status; EDKII_PLATFORM_REPOSITORY_INFO * PlatformRepo; =20 - Status =3D EFI_SUCCESS; if ((This =3D=3D NULL) || (CmObject =3D=3D NULL)) { ASSERT (This !=3D NULL); ASSERT (CmObject !=3D NULL); return EFI_INVALID_PARAMETER; } + + Status =3D EFI_NOT_FOUND; PlatformRepo =3D This->PlatRepoInfo; =20 switch (GET_CM_OBJECT_ID (CmObjectId)) { - HANDLE_CM_OBJECT ( - EArmObjBootArchInfo, - CmObjectId, - PlatformRepo->BootArchInfo, - 1 - ); + case EArmObjBootArchInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->BootArchInfo, + sizeof (PlatformRepo->BootArchInfo), + 1, + CmObject + ); + break; + #ifdef HEADLESS_PLATFORM - HANDLE_CM_OBJECT ( - EArmObjFixedFeatureFlags, - CmObjectId, - PlatformRepo->FixedFeatureFlags, - 1 - ); + case EArmObjFixedFeatureFlags: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->FixedFeatureFlags, + sizeof (PlatformRepo->FixedFeatureFlags), + 1, + CmObject + ); + break; #endif - HANDLE_CM_OBJECT ( - EArmObjPowerManagementProfileInfo, - CmObjectId, - PlatformRepo->PmProfileInfo, - 1 - ); - HANDLE_CM_OBJECT ( - EArmObjGenericTimerInfo, - CmObjectId, - PlatformRepo->GenericTimerInfo, - 1 - ); - HANDLE_CM_OBJECT ( - EArmObjPlatformGenericWatchdogInfo, - CmObjectId, - PlatformRepo->Watchdog, - 1 - ); - HANDLE_CM_OBJECT ( - EArmObjPlatformGTBlockInfo, - CmObjectId, - PlatformRepo->GTBlockInfo, - (sizeof (PlatformRepo->GTBlockInfo) / - sizeof (PlatformRepo->GTBlockInfo[0])) - ); - HANDLE_CM_OBJECT_REF_BY_TOKEN ( - EArmObjGTBlockTimerFrameInfo, - CmObjectId, - PlatformRepo->GTBlock0TimerInfo, - (sizeof (PlatformRepo->GTBlock0TimerInfo) / - sizeof (PlatformRepo->GTBlock0TimerInfo[0])), - Token, - GetGTBlockTimerFrameInfo - ); - HANDLE_CM_OBJECT ( - EArmObjGicCInfo, - CmObjectId, - PlatformRepo->GicCInfo, - (sizeof (PlatformRepo->GicCInfo) / - sizeof (PlatformRepo->GicCInfo[0])) - ); - HANDLE_CM_OBJECT ( - EArmObjGicDInfo, - CmObjectId, - PlatformRepo->GicDInfo, - 1 - ); - HANDLE_CM_OBJECT ( - EArmObjGicRedistributorInfo, - CmObjectId, - PlatformRepo->GicRedistInfo, - 1 - ); - HANDLE_CM_OBJECT ( - EArmObjSerialConsolePortInfo, - CmObjectId, - PlatformRepo->SpcrSerialPort, - 1 - ); - HANDLE_CM_OBJECT ( - EArmObjSerialDebugPortInfo, - CmObjectId, - PlatformRepo->DbgSerialPort, - 1 - ); - HANDLE_CM_OBJECT ( - EArmObjGicItsInfo, - CmObjectId, - PlatformRepo->GicItsInfo, - 1 - ); + case EArmObjPowerManagementProfileInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->PmProfileInfo, + sizeof (PlatformRepo->PmProfileInfo), + 1, + CmObject + ); + break; + + case EArmObjGenericTimerInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->GenericTimerInfo, + sizeof (PlatformRepo->GenericTimerInfo), + 1, + CmObject + ); + break; + + case EArmObjPlatformGenericWatchdogInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->Watchdog, + sizeof (PlatformRepo->Watchdog), + 1, + CmObject + ); + break; + + case EArmObjPlatformGTBlockInfo: + Status =3D HandleCmObject ( + CmObjectId, + PlatformRepo->GTBlockInfo, + sizeof (PlatformRepo->GTBlockInfo), + ARRAY_SIZE (PlatformRepo->GTBlockInfo), + CmObject + ); + break; + + case EArmObjGTBlockTimerFrameInfo: + Status =3D HandleCmObjectRefByToken ( + This, + CmObjectId, + PlatformRepo->GTBlock0TimerInfo, + sizeof (PlatformRepo->GTBlock0TimerInfo), + ARRAY_SIZE (PlatformRepo->GTBlock0TimerInfo), + Token, + GetGTBlockTimerFrameInfo, + CmObject + ); + break; + + case EArmObjGicCInfo: + Status =3D HandleCmObject ( + CmObjectId, + PlatformRepo->GicCInfo, + sizeof (PlatformRepo->GicCInfo), + ARRAY_SIZE (PlatformRepo->GicCInfo), + CmObject + ); + break; + + case EArmObjGicDInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->GicDInfo, + sizeof (PlatformRepo->GicDInfo), + 1, + CmObject + ); + break; + + case EArmObjGicRedistributorInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->GicRedistInfo, + sizeof (PlatformRepo->GicRedistInfo), + 1, + CmObject + ); + break; + + case EArmObjSerialConsolePortInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->SpcrSerialPort, + sizeof (PlatformRepo->SpcrSerialPort), + 1, + CmObject + ); + break; + + case EArmObjSerialDebugPortInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->DbgSerialPort, + sizeof (PlatformRepo->DbgSerialPort), + 1, + CmObject + ); + break; + + case EArmObjGicItsInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->GicItsInfo, + sizeof (PlatformRepo->GicItsInfo), + 1, + CmObject + ); + break; =20 default: { Status =3D EFI_NOT_FOUND; diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/ConfigurationManager.h b/Platform/ARM/VExpressPkg/ConfigurationMana= ger/ConfigurationManagerDxe/ConfigurationManager.h index 6fb959ab7ae2c77f750781d05660957488fae8cd..c25ba9fac52fe049236948185df= c052c44a71e4b 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.h +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.h @@ -1,6 +1,6 @@ /** @file =20 - Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.
+ Copyright (c) 2017 - 2021, Arm Limited. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -52,61 +52,24 @@ extern CHAR8 dsdt_aml_code[]; EnergyEfficiency /* UINT8 ProcessorPowerEfficiencyClass*/ \ } =20 -/** A helper macro for returning configuration manager objects -*/ -#define HANDLE_CM_OBJECT(ObjId, CmObjectId, Object, ObjectCount) \ - case ObjId: { \ - CmObject->ObjectId =3D CmObjectId; \ - CmObject->Size =3D sizeof (Object); \ - CmObject->Data =3D (VOID*)&Object; \ - CmObject->Count =3D ObjectCount; \ - DEBUG (( \ - DEBUG_INFO, \ - #CmObjectId ": Ptr =3D 0x%p, Size =3D %d, Count =3D %d\n", = \ - CmObject->Data, \ - CmObject->Size, \ - CmObject->Count \ - )); \ - break; \ - } +/** A function that prepares Configuration Manager Objects for returning. =20 -/** A helper macro for returning configuration manager objects - referenced by token -*/ -#define HANDLE_CM_OBJECT_REF_BY_TOKEN( = \ - ObjId, = \ - CmObjectId, = \ - Object, = \ - ObjectCount, = \ - Token, = \ - HandlerProc = \ - ) = \ - case ObjId: { = \ - CmObject->ObjectId =3D CmObjectId; = \ - if (Token =3D=3D CM_NULL_TOKEN) { = \ - CmObject->Size =3D sizeof (Object); = \ - CmObject->Data =3D (VOID*)&Object; = \ - CmObject->Count =3D ObjectCount; = \ - DEBUG (( = \ - DEBUG_INFO, = \ - #CmObjectId ": Ptr =3D 0x%p, Size =3D %d, Count =3D %d\n", = \ - CmObject->Data, = \ - CmObject->Size, = \ - CmObject->Count = \ - )); = \ - } else { = \ - Status =3D HandlerProc (This, CmObjectId, Token, CmObject); = \ - DEBUG (( = \ - DEBUG_INFO, = \ - #CmObjectId ": Token =3D 0x%p, Ptr =3D 0x%p, Size =3D %d, Count = =3D %d\n", \ - (VOID*)Token, = \ - CmObject->Data, = \ - CmObject->Size, = \ - CmObject->Count = \ - )); = \ - } = \ - break; = \ - } + @param [in] This Pointer to the Configuration Manager Protocol. + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Token A token for identifying the object. + @param [out] CmObject Pointer to the Configuration Manager Object + descriptor describing the requested Object. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER A parameter is invalid. + @retval EFI_NOT_FOUND The required object information is not fou= nd. +**/ +typedef EFI_STATUS (*CM_OBJECT_HANDLER_PROC) ( + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST This, + IN CONST CM_OBJECT_ID CmObjectId, + IN CONST CM_OBJECT_TOKEN Token, + IN OUT CM_OBJ_DESCRIPTOR * CONST CmObject + ); =20 /** The number of CPUs */ --=20 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#70682): https://edk2.groups.io/g/devel/message/70682 Mute This Topic: https://groups.io/mt/80029715/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Mon Apr 29 02:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+70681+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1611322197874274.93367606480183; Fri, 22 Jan 2021 05:29:57 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id qMs9YY1788612xp39fbLKGrS; Fri, 22 Jan 2021 05:29:57 -0800 X-Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.54]) by mx.groups.io with SMTP id smtpd.web12.8859.1611322191088250385 for ; Fri, 22 Jan 2021 05:29:51 -0800 X-Received: from AM0PR10CA0118.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::35) by PR3PR08MB5739.eurprd08.prod.outlook.com (2603:10a6:102:8e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.13; Fri, 22 Jan 2021 13:29:48 +0000 X-Received: from AM5EUR03FT047.eop-EUR03.prod.protection.outlook.com (2603:10a6:208:e6:cafe::2c) by AM0PR10CA0118.outlook.office365.com (2603:10a6:208:e6::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Fri, 22 Jan 2021 13:29:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+70681+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT047.mail.protection.outlook.com (10.152.16.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.11 via Frontend Transport; Fri, 22 Jan 2021 13:29:47 +0000 X-Received: ("Tessian outbound e989e14f9207:v71"); Fri, 22 Jan 2021 13:29:47 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 4d6aef7e354eb282 X-CR-MTA-TID: 64aa7808 X-Received: from 8893f11aa350.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 9B22D093-4F12-4DF6-B99B-33D650192B47.1; Fri, 22 Jan 2021 13:29:41 +0000 X-Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 8893f11aa350.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 22 Jan 2021 13:29:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jbS/nffjaXPLUY768iAO7EwR5ip7/7KNRgVUvJ6utIBHIWxmyQeBsrYfvOoliF7kDVQsRV2pjtQEhcusDDwZ/G4pVOBuLci99tWcT4+1txinBN+M3vBP5t7Ak3dfjuxwZKhig2JfeHaZSW3S/0UFSvMoY4jlMYGCQufoKdpPM6TG8UnTa2Xtw15KX0GXVA+hPw0NdeER10xxGWjpuw24hYjs3VmezHeFB6HlP4Bea8SdPG9zGgjFxclZk7/bAPaP2cgsFutLpPEGqyY+IV3xr2xoUsGC9y7ej2AS3VomX7p9ExSRhC+8C4YftHK/+6e3BNvbyTv2+adqtnjOnsJVMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Nh9B1IaxcqNEqkUFsMLRAZCifOo+w8sFLdd3DOSiKG4=; b=TybuOa4Mi7OKNSzF2Y3CZMnG6/x5dhPBVOanxQWT4peT6V/S10mssSzncQ7J7ep5NJKt7HnvTYCQGJSfCg+6aCq1Dz1AahQAiZE1LoC0P2MoY59j/O9NcsiHb498N4BK08u7Nd64/E281G/jKhuDwB33TSm4OZSEHDTOdAuH9fsCpAv6k51rEuD4IG1r8/cXtiVRcFlNTNP5CXmwJ8QQ/YTBx9ozK8YOvKdA7TnNrTwneGnCo7V18d1WfnkzMxljkWlhwxZB1ESY/nknq7xgUxcKzFGSJQ6/FrQ0LeZF7x4hH+2N1upb5Fc9l4uOYF0wo83gGS6RUCIONLc6GEGLrg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from DB6PR0202CA0014.eurprd02.prod.outlook.com (2603:10a6:4:29::24) by AM8PR08MB5618.eurprd08.prod.outlook.com (2603:10a6:20b:1d7::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.13; Fri, 22 Jan 2021 13:29:40 +0000 X-Received: from DB5EUR03FT005.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:29:cafe::c1) by DB6PR0202CA0014.outlook.office365.com (2603:10a6:4:29::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Fri, 22 Jan 2021 13:29:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass 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; X-Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT005.mail.protection.outlook.com (10.152.20.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3784.11 via Frontend Transport; Fri, 22 Jan 2021 13:29:40 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) 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.2044.4; Fri, 22 Jan 2021 13:29:38 +0000 X-Received: from E107187.Arm.com (10.57.3.168) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2044.4 via Frontend Transport; Fri, 22 Jan 2021 13:29:37 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , Subject: [edk2-devel] [PATCH edk2-platforms v1 2/6] Platform/ARM: Juno: Remove usage of function macros Date: Fri, 22 Jan 2021 13:29:31 +0000 Message-ID: <20210122132935.22484-3-sami.mujawar@arm.com> In-Reply-To: <20210122132935.22484-1-sami.mujawar@arm.com> References: <20210122132935.22484-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c40324a5-0151-4b5d-90de-08d8bed9c9c3 X-MS-TrafficTypeDiagnostic: AM8PR08MB5618:|PR3PR08MB5739: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:2201;OLM:2201; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Z9hXJdyVyxvK/1CsrDht1TQQUD5fJQWOsN6ZPcmBCMbyOpBCqbjWXoCjDAqoEXPwON711pSfeEXyV72e69OWw4LmmdoJKwTWUyE+ekBR05jURUaiiikCj4isL4p8C7NJ9fl0jkRnNtHOg1p+ioYfYdqSgyxebhhDuOdVT9D+u7hPvSW64jgegKqAr8vmKDnOQrbVLp3e8xKqvxJ+XT+lFBS5bL+dYcPIHJdvBd7ZO+IfxWiw8+TeHgXZyNbOup7+WgiDZOB2bnHb84qXFJImdowqhh6aavQZTzWO1JhQDTeCqzMoBCsq/1Ct2JsRkM+JPnYujrIsWDXASjxpkOJLfEynQo3fIdcRTPRHsiy5ZZk6heFwbLeGEnEIDDsU1SIFwr6rs9rD252qhzMft33pvvbJyqrr6dk0swev+4z4BLJXrkXDYz//BvWgvA82j581Xg+4vRpBhngGWgsxe5H9UAAfb2m6jhdeQdJh/8Il2DtdiuprlhdtLnfZVz8ZRnJMdNOvx9UxM2Iw55zLN6LJWy4zHESEz2beh0CiQwOiMIFJsUhsYnp7USLYWuSW5e2X X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(346002)(39840400004)(396003)(376002)(136003)(46966006)(30864003)(86362001)(2906002)(8936002)(6666004)(5660300002)(47076005)(82310400003)(356005)(316002)(966005)(36756003)(1076003)(83380400001)(81166007)(44832011)(4326008)(426003)(336012)(478600001)(2616005)(26005)(6916009)(70206006)(54906003)(70586007)(8676002)(186003)(7696005)(36610700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR08MB5618 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT047.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: d3eb3854-f00e-493f-4338-08d8bed9c565 X-Microsoft-Antispam-Message-Info: 1fx33FH1CRXbr9wG+1LKWba5JbWviVRoP1s0yuEOSdYz6vDmLmrhZvVSDWvwga/dEd9ayzsIAkBK6SxCn6EoTd1OWvdKTQMBzu3RXkprSiyXB0oRS38mopXO0frFBqSSwBwZK3fqIDAqjGTfWZaeF5PB8Is9sKe9mSTRsfC4WVLXP5itSfj7tWGn6zFH1apn0LdRnwJvfVHpHLs3FK3ElOeruvcksoLGLSaDh86iO86CjTdWZuGNok5bJMnNiAoFMjYEKiqO+ES/uzg4RoGBTSXAiaOdQ6+Ioou0zSemxXLMaN1024SAIgTRUW7EQF6P010sZTwaWsPFkjQ4IkgtHR4wGI1VXTIY1o2rbZdZf3NrAB7FJ3LMbdZlFJzHDIeOV3wz90NoiKjyMID2XJoq8ascytuLFCwnNpmiS4sGzxDDgPpk8RSWWFKXNXyKcsNx3oRogmimpxBVDpwV3KC9MunlDzKnGgQ4J7VNGaq/p7YhmebxxdLUQrL+EETQ7osb8I0vJJfEjMwlbP9LLWyq0VaLgEtmiUf+fvu2ZvPN6SY= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2021 13:29:47.4403 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c40324a5-0151-4b5d-90de-08d8bed9c9c3 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT047.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR08MB5739 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,sami.mujawar@arm.com X-Gm-Message-State: PUzaGtaZnRpfh1MQnFco8ZhEx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1611322197; bh=rpyeZgnaUrQUWFBLFuWEJvXqzn2SSLU4dQtItdR6LWw=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=wD3YzVzZ4jY7UFh/qKpvQGYcDIIT2orOcZuRgZoG5qDUgwuZKLSfEd8txpZ3z9sw6kf nsAHm/N9imgoOiLrQqvW43DGMnRD+fmk3O1tX8Wg8siIXTAh2IZO6IZoHKT315BPunVgk rGxyHLlvwALt1lgXamN738B6MZuebx3T/O8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The Configuration Manager code for Juno uses function macros to prepare and return CM objects. However, according to section 5.5.2.1 of the edk2 coding standard, use of functional macros is not allowed. See https://edk2-docs.gitbook.io/edk-ii-c-coding-standards-specification/ 5_source_files/55_preprocessor_directives#5-5-2-1-functional-macros-are- generally-discouraged Therefore, replace the function macros with static helper functions. Signed-off-by: Sami Mujawar Reviewed-by: Leif Lindholm --- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Configur= ationManager.c | 448 ++++++++++++++------ Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Configur= ationManager.h | 104 +---- 2 files changed, 336 insertions(+), 216 deletions(-) diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager= Dxe/ConfigurationManager.c b/Platform/ARM/JunoPkg/ConfigurationManager/Conf= igurationManagerDxe/ConfigurationManager.c index 913cffc9b994319065b5292b0d28970a0a0d8320..8d92a8a666af4c5555343a929cb= 2d5063e54ffd5 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.c +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.c @@ -1,7 +1,7 @@ /** @file Configuration Manager Dxe =20 - Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.
+ Copyright (c) 2017 - 2021, Arm Limited. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -559,6 +559,149 @@ EDKII_PLATFORM_REPOSITORY_INFO ArmJunoPlatformReposit= oryInfo =3D { } }; =20 +/** A helper function for returning the Configuration Manager Objects. + + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Object Pointer to the Object(s). + @param [in] ObjectSize Total size of the Object(s). + @param [in] ObjectCount Number of Objects. + @param [in, out] CmObjectDesc Pointer to the Configuration Manager Ob= ject + descriptor describing the requested Obj= ect. + + @retval EFI_SUCCESS Success. +**/ +STATIC +EFI_STATUS +EFIAPI +HandleCmObject ( + IN CONST CM_OBJECT_ID CmObjectId, + IN VOID * Object, + IN CONST UINTN ObjectSize, + IN CONST UINTN ObjectCount, + IN OUT CM_OBJ_DESCRIPTOR * CONST CmObjectDesc + ) +{ + CmObjectDesc->ObjectId =3D CmObjectId; + CmObjectDesc->Size =3D ObjectSize; + CmObjectDesc->Data =3D (VOID*)Object; + CmObjectDesc->Count =3D ObjectCount; + DEBUG (( + DEBUG_INFO, + "INFO: CmObjectId =3D %x, Ptr =3D 0x%p, Size =3D %d, Count =3D %d\n", + CmObjectId, + CmObjectDesc->Data, + CmObjectDesc->Size, + CmObjectDesc->Count + )); + return EFI_SUCCESS; +} + +/** A helper function for returning the Configuration Manager Objects that + match the token. + + @param [in] This Pointer to the Configuration Manager Pro= tocol. + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Object Pointer to the Object(s). + @param [in] ObjectSize Total size of the Object(s). + @param [in] ObjectCount Number of Objects. + @param [in] Token A token identifying the object. + @param [in] HandlerProc A handler function to search the object + referenced by the token. + @param [in, out] CmObjectDesc Pointer to the Configuration Manager Obj= ect + descriptor describing the requested Obje= ct. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER A parameter is invalid. + @retval EFI_NOT_FOUND The required object information is not fou= nd. +**/ +STATIC +EFI_STATUS +EFIAPI +HandleCmObjectRefByToken ( + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST This, + IN CONST CM_OBJECT_ID CmObjectId, + IN VOID * Object, + IN CONST UINTN ObjectSize, + IN CONST UINTN ObjectCount, + IN CONST CM_OBJECT_TOKEN Token, + IN CONST CM_OBJECT_HANDLER_PROC HandlerProc, + IN OUT CM_OBJ_DESCRIPTOR * CONST CmObjectDesc + ) +{ + EFI_STATUS Status; + CmObjectDesc->ObjectId =3D CmObjectId; + if (Token =3D=3D CM_NULL_TOKEN) { + CmObjectDesc->Size =3D ObjectSize; + CmObjectDesc->Data =3D (VOID*)Object; + CmObjectDesc->Count =3D ObjectCount; + Status =3D EFI_SUCCESS; + } else { + Status =3D HandlerProc (This, CmObjectId, Token, CmObjectDesc); + } + + DEBUG (( + DEBUG_INFO, + "INFO: Token =3D 0x%p, CmObjectId =3D %x, Ptr =3D 0x%p, Size =3D %d, C= ount =3D %d\n", + (VOID*)Token, + CmObjectId, + CmObjectDesc->Data, + CmObjectDesc->Size, + CmObjectDesc->Count + )); + return Status; +} + +/** A helper function for returning Configuration Manager Object(s) refere= nced + by token when the entire platform repository is in scope and the + CM_NULL_TOKEN value is not allowed. + + @param [in] This Pointer to the Configuration Manager Pro= tocol. + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Token A token identifying the object. + @param [in] HandlerProc A handler function to search the object(= s) + referenced by the token. + @param [in, out] CmObjectDesc Pointer to the Configuration Manager Obj= ect + descriptor describing the requested Obje= ct. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER A parameter is invalid. + @retval EFI_NOT_FOUND The required object information is not fou= nd. +**/ +STATIC +EFI_STATUS +EFIAPI +HandleCmObjectSearchPlatformRepo ( + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST This, + IN CONST CM_OBJECT_ID CmObjectId, + IN CONST CM_OBJECT_TOKEN Token, + IN CONST CM_OBJECT_HANDLER_PROC HandlerProc, + IN OUT CM_OBJ_DESCRIPTOR * CONST CmObjectDesc + ) +{ + EFI_STATUS Status; + CmObjectDesc->ObjectId =3D CmObjectId; + if (Token =3D=3D CM_NULL_TOKEN) { + DEBUG (( + DEBUG_ERROR, + "ERROR: CM_NULL_TOKEN value is not allowed when searching" + " the entire platform repository.\n" + )); + return EFI_INVALID_PARAMETER; + } + + Status =3D HandlerProc (This, CmObjectId, Token, CmObjectDesc); + DEBUG (( + DEBUG_INFO, + "INFO: Token =3D 0x%p, CmObjectId =3D %x, Ptr =3D 0x%p, Size =3D %d, C= ount =3D %d\n", + CmObjectId, + (VOID*)Token, + CmObjectDesc->Data, + CmObjectDesc->Size, + CmObjectDesc->Count + )); + return Status; +} + /** Initialize the platform configuration repository. =20 @param [in] This Pointer to the Configuration Manager Protocol. @@ -760,46 +903,42 @@ GetStandardNameSpaceObject ( EDKII_PLATFORM_REPOSITORY_INFO * PlatformRepo; UINT32 TableCount; =20 - Status =3D EFI_SUCCESS; if ((This =3D=3D NULL) || (CmObject =3D=3D NULL)) { ASSERT (This !=3D NULL); ASSERT (CmObject !=3D NULL); return EFI_INVALID_PARAMETER; } + + Status =3D EFI_NOT_FOUND; PlatformRepo =3D This->PlatRepoInfo; =20 switch (GET_CM_OBJECT_ID (CmObjectId)) { - HANDLE_CM_OBJECT ( - EStdObjCfgMgrInfo, - CmObjectId, - PlatformRepo->CmInfo, - 1 - ); + case EStdObjCfgMgrInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->CmInfo, + sizeof (PlatformRepo->CmInfo), + 1, + CmObject + ); + break; =20 case EStdObjAcpiTableList: - CmObject->ObjectId =3D CmObjectId; - TableCount =3D sizeof (PlatformRepo->CmAcpiTableList) / - sizeof (PlatformRepo->CmAcpiTableList[0]); - if (PlatformRepo->JunoRevision !=3D JUNO_REVISION_R0) { - CmObject->Size =3D sizeof (PlatformRepo->CmAcpiTableList); - CmObject->Count =3D TableCount; - } else { + TableCount =3D ARRAY_SIZE (PlatformRepo->CmAcpiTableList); + if (PlatformRepo->JunoRevision =3D=3D JUNO_REVISION_R0) { /* The last 2 tables in the ACPI table list enable PCIe support. - Reduce the CmObject size so that the PCIe specific ACPI + Reduce the TableCount so that the PCIe specific ACPI tables are not installed on Juno R0 */ - CmObject->Size =3D sizeof (PlatformRepo->CmAcpiTableList[0]) * - (TableCount - 2); - CmObject->Count =3D TableCount - 2; + TableCount -=3D 2; } - CmObject->Data =3D (VOID*)&PlatformRepo->CmAcpiTableList; - DEBUG (( - DEBUG_INFO, - "EStdObjAcpiTableList: Ptr =3D 0x%p. Size =3D %d, Count =3D %d\n", - CmObject->Data, - CmObject->Size, - CmObject->Count - )); + Status =3D HandleCmObject ( + CmObjectId, + PlatformRepo->CmAcpiTableList, + (sizeof (PlatformRepo->CmAcpiTableList[0]) * TableCount), + TableCount, + CmObject + ); break; =20 default: { @@ -842,120 +981,171 @@ GetArmNameSpaceObject ( EFI_STATUS Status; EDKII_PLATFORM_REPOSITORY_INFO * PlatformRepo; =20 - Status =3D EFI_SUCCESS; if ((This =3D=3D NULL) || (CmObject =3D=3D NULL)) { ASSERT (This !=3D NULL); ASSERT (CmObject !=3D NULL); return EFI_INVALID_PARAMETER; } + + Status =3D EFI_NOT_FOUND; PlatformRepo =3D This->PlatRepoInfo; =20 switch (GET_CM_OBJECT_ID (CmObjectId)) { - HANDLE_CM_OBJECT ( - EArmObjBootArchInfo, - CmObjectId, - PlatformRepo->BootArchInfo, - 1 - ); - HANDLE_CM_OBJECT ( - EArmObjPowerManagementProfileInfo, - CmObjectId, - PlatformRepo->PmProfileInfo, - 1 - ); - HANDLE_CM_OBJECT ( - EArmObjGenericTimerInfo, - CmObjectId, - PlatformRepo->GenericTimerInfo, - 1 - ); - HANDLE_CM_OBJECT ( - EArmObjPlatformGenericWatchdogInfo, - CmObjectId, - PlatformRepo->Watchdog, - 1 - ); - HANDLE_CM_OBJECT ( - EArmObjPlatformGTBlockInfo, - CmObjectId, - PlatformRepo->GTBlockInfo, - (sizeof (PlatformRepo->GTBlockInfo) / - sizeof (PlatformRepo->GTBlockInfo[0])) - ); - HANDLE_CM_OBJECT_REF_BY_TOKEN ( - EArmObjGTBlockTimerFrameInfo, - CmObjectId, - PlatformRepo->GTBlock0TimerInfo, - (sizeof (PlatformRepo->GTBlock0TimerInfo) / - sizeof (PlatformRepo->GTBlock0TimerInfo[0])), - Token, - GetGTBlockTimerFrameInfo - ); - HANDLE_CM_OBJECT_REF_BY_TOKEN ( - EArmObjGicCInfo, - CmObjectId, - PlatformRepo->GicCInfo, - ARRAY_SIZE (PlatformRepo->GicCInfo), - Token, - GetGicCInfo - ); - HANDLE_CM_OBJECT ( - EArmObjGicDInfo, - CmObjectId, - PlatformRepo->GicDInfo, - 1 - ); - HANDLE_CM_OBJECT ( - EArmObjSerialConsolePortInfo, - CmObjectId, - PlatformRepo->SpcrSerialPort, - 1 - ); + case EArmObjBootArchInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->BootArchInfo, + sizeof (PlatformRepo->BootArchInfo), + 1, + CmObject + ); + break; + case EArmObjPowerManagementProfileInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->PmProfileInfo, + sizeof (PlatformRepo->PmProfileInfo), + 1, + CmObject + ); + break; =20 - HANDLE_CM_OBJECT ( - EArmObjSerialDebugPortInfo, - CmObjectId, - PlatformRepo->DbgSerialPort, - 1 - ); - HANDLE_CM_OBJECT ( - EArmObjGicMsiFrameInfo, - CmObjectId, - PlatformRepo->GicMsiFrameInfo, - 1 - ); - HANDLE_CM_OBJECT ( - EArmObjProcHierarchyInfo, - CmObjectId, - PlatformRepo->ProcHierarchyInfo, - ARRAY_SIZE (PlatformRepo->ProcHierarchyInfo) - ); - HANDLE_CM_OBJECT ( - EArmObjCacheInfo, - CmObjectId, - PlatformRepo->CacheInfo, - ARRAY_SIZE (PlatformRepo->CacheInfo) - ); - HANDLE_CM_OBJECT_SEARCH_PLAT_REPO ( - EArmObjCmRef, - CmObjectId, - Token, - GetCmObjRefs - ); + case EArmObjGenericTimerInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->GenericTimerInfo, + sizeof (PlatformRepo->GenericTimerInfo), + 1, + CmObject + ); + break; + + case EArmObjPlatformGenericWatchdogInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->Watchdog, + sizeof (PlatformRepo->Watchdog), + 1, + CmObject + ); + break; + + case EArmObjPlatformGTBlockInfo: + Status =3D HandleCmObject ( + CmObjectId, + PlatformRepo->GTBlockInfo, + sizeof (PlatformRepo->GTBlockInfo), + ARRAY_SIZE (PlatformRepo->GTBlockInfo), + CmObject + ); + break; + + case EArmObjGTBlockTimerFrameInfo: + Status =3D HandleCmObjectRefByToken ( + This, + CmObjectId, + PlatformRepo->GTBlock0TimerInfo, + sizeof (PlatformRepo->GTBlock0TimerInfo), + ARRAY_SIZE (PlatformRepo->GTBlock0TimerInfo), + Token, + GetGTBlockTimerFrameInfo, + CmObject + ); + break; + + case EArmObjGicCInfo: + Status =3D HandleCmObjectRefByToken ( + This, + CmObjectId, + PlatformRepo->GicCInfo, + sizeof (PlatformRepo->GicCInfo), + ARRAY_SIZE (PlatformRepo->GicCInfo), + Token, + GetGicCInfo, + CmObject + ); + break; + + case EArmObjGicDInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->GicDInfo, + sizeof (PlatformRepo->GicDInfo), + 1, + CmObject + ); + break; + case EArmObjSerialConsolePortInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->SpcrSerialPort, + sizeof (PlatformRepo->SpcrSerialPort), + 1, + CmObject + ); + break; + + case EArmObjSerialDebugPortInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->DbgSerialPort, + sizeof (PlatformRepo->DbgSerialPort), + 1, + CmObject + ); + break; + case EArmObjGicMsiFrameInfo: + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->GicMsiFrameInfo, + sizeof (PlatformRepo->GicMsiFrameInfo), + 1, + CmObject + ); + break; + + case EArmObjProcHierarchyInfo: + Status =3D HandleCmObject ( + CmObjectId, + PlatformRepo->ProcHierarchyInfo, + sizeof (PlatformRepo->ProcHierarchyInfo), + ARRAY_SIZE (PlatformRepo->ProcHierarchyInfo), + CmObject + ); + break; + + case EArmObjCacheInfo: + Status =3D HandleCmObject ( + CmObjectId, + PlatformRepo->CacheInfo, + sizeof (PlatformRepo->CacheInfo), + ARRAY_SIZE (PlatformRepo->CacheInfo), + CmObject + ); + break; + + case EArmObjCmRef: + Status =3D HandleCmObjectSearchPlatformRepo ( + This, + CmObjectId, + Token, + GetCmObjRefs, + CmObject + ); + break; =20 case EArmObjPciConfigSpaceInfo: if (PlatformRepo->JunoRevision !=3D JUNO_REVISION_R0) { - CmObject->ObjectId =3D CmObjectId; - CmObject->Size =3D sizeof (PlatformRepo->PciConfigInfo); - CmObject->Count =3D 1; - CmObject->Data =3D (VOID*)&PlatformRepo->PciConfigInfo; - DEBUG (( - DEBUG_INFO, - "EArmObjPciConfigSpaceInfo: Ptr =3D 0x%p, Size =3D %d, Count =3D= %d\n", - CmObject->Data, - CmObject->Size, - CmObject->Count - )); + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->PciConfigInfo, + sizeof (PlatformRepo->PciConfigInfo), + 1, + CmObject + ); + } else { + // No PCIe on Juno R0. + Status =3D EFI_NOT_FOUND; } break; =20 diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager= Dxe/ConfigurationManager.h b/Platform/ARM/JunoPkg/ConfigurationManager/Conf= igurationManagerDxe/ConfigurationManager.h index 2073ae4902e540de869612353bfaf0ebacaea50d..f382c7f967420c4fa8f272f3fee= 5c8f191999b23 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.h +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.h @@ -1,6 +1,6 @@ /** @file =20 - Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.
+ Copyright (c) 2017 - 2021, Arm Limited. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -91,94 +91,24 @@ extern CHAR8 ssdtuart_aml_code[]; (WritePolicy << 4) \ ) =20 -/** A helper macro for returning configuration manager objects -*/ -#define HANDLE_CM_OBJECT(ObjId, CmObjectId, Object, ObjectCount) \ - case ObjId: { \ - CmObject->ObjectId =3D CmObjectId; \ - CmObject->Size =3D sizeof (Object); \ - CmObject->Data =3D (VOID*)&Object; \ - CmObject->Count =3D ObjectCount; \ - DEBUG (( \ - DEBUG_INFO, \ - #CmObjectId ": Ptr =3D 0x%p, Size =3D %d, Count =3D %d\n", = \ - CmObject->Data, \ - CmObject->Size, \ - CmObject->Count \ - )); \ - break; \ - } +/** A function that prepares Configuration Manager Objects for returning. =20 -/** A helper macro for returning configuration manager objects - referenced by token -*/ -#define HANDLE_CM_OBJECT_REF_BY_TOKEN( = \ - ObjId, = \ - CmObjectId, = \ - Object, = \ - ObjectCount, = \ - Token, = \ - HandlerProc = \ - ) = \ - case ObjId: { = \ - CmObject->ObjectId =3D CmObjectId; = \ - if (Token =3D=3D CM_NULL_TOKEN) { = \ - CmObject->Size =3D sizeof (Object); = \ - CmObject->Data =3D (VOID*)&Object; = \ - CmObject->Count =3D ObjectCount; = \ - DEBUG (( = \ - DEBUG_INFO, = \ - #CmObjectId ": Ptr =3D 0x%p, Size =3D %d, Count =3D %d\n", = \ - CmObject->Data, = \ - CmObject->Size, = \ - CmObject->Count = \ - )); = \ - } else { = \ - Status =3D HandlerProc (This, CmObjectId, Token, CmObject); = \ - DEBUG (( = \ - DEBUG_INFO, = \ - #CmObjectId ": Token =3D 0x%p, Ptr =3D 0x%p, Size =3D %d, Count = =3D %d\n", \ - (VOID*)Token, = \ - CmObject->Data, = \ - CmObject->Size, = \ - CmObject->Count = \ - )); = \ - } = \ - break; = \ - } + @param [in] This Pointer to the Configuration Manager Protocol. + @param [in] CmObjectId The Configuration Manager Object ID. + @param [in] Token A token for identifying the object. + @param [out] CmObject Pointer to the Configuration Manager Object + descriptor describing the requested Object. =20 -/** A helper macro for returning configuration manager objects referenced - by token when the entire platform repository is in scope and the - CM_NULL_TOKEN value is not allowed. -*/ -#define HANDLE_CM_OBJECT_SEARCH_PLAT_REPO( = \ - ObjId, = \ - CmObjectId, = \ - Token, = \ - HandlerProc = \ - ) = \ - case ObjId: { = \ - CmObject->ObjectId =3D CmObjectId; = \ - if (Token =3D=3D CM_NULL_TOKEN) { = \ - Status =3D EFI_INVALID_PARAMETER; = \ - DEBUG (( = \ - DEBUG_ERROR, = \ - #ObjId ": CM_NULL_TOKEN value is not allowed when searching" = \ - " the entire platform repository.\n" = \ - )); = \ - } else { = \ - Status =3D HandlerProc (This, CmObjectId, Token, CmObject); = \ - DEBUG (( = \ - DEBUG_INFO, = \ - #ObjId ": Token =3D 0x%p, Ptr =3D 0x%p, Size =3D %d, Count =3D %d\= n", \ - (VOID*)Token, = \ - CmObject->Data, = \ - CmObject->Size, = \ - CmObject->Count = \ - )); = \ - } = \ - break; = \ - } + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER A parameter is invalid. + @retval EFI_NOT_FOUND The required object information is not fou= nd. +**/ +typedef EFI_STATUS (*CM_OBJECT_HANDLER_PROC) ( + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST This, + IN CONST CM_OBJECT_ID CmObjectId, + IN CONST CM_OBJECT_TOKEN Token, + IN OUT CM_OBJ_DESCRIPTOR * CONST CmObject + ); =20 /** The number of CPUs */ --=20 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#70681): https://edk2.groups.io/g/devel/message/70681 Mute This Topic: https://groups.io/mt/80029714/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Mon Apr 29 02:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+70687+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1611322198196493.4269918710627; Fri, 22 Jan 2021 05:29:58 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id ehHkYY1788612xw5RR9KE5Dn; Fri, 22 Jan 2021 05:29:57 -0800 X-Received: from EUR01-DB5-obe.outbound.protection.outlook.com (EUR01-DB5-obe.outbound.protection.outlook.com [40.107.15.82]) by mx.groups.io with SMTP id smtpd.web12.8861.1611322196487602466 for ; Fri, 22 Jan 2021 05:29:56 -0800 X-Received: from DB6P192CA0004.EURP192.PROD.OUTLOOK.COM (2603:10a6:4:b8::14) by VI1PR08MB2640.eurprd08.prod.outlook.com (2603:10a6:802:1a::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.13; Fri, 22 Jan 2021 13:29:50 +0000 X-Received: from DB5EUR03FT008.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:b8:cafe::52) by DB6P192CA0004.outlook.office365.com (2603:10a6:4:b8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Fri, 22 Jan 2021 13:29:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+70687+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT008.mail.protection.outlook.com (10.152.20.98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.11 via Frontend Transport; Fri, 22 Jan 2021 13:29:50 +0000 X-Received: ("Tessian outbound af289585f0f4:v71"); Fri, 22 Jan 2021 13:29:50 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: a93e7740484154a2 X-CR-MTA-TID: 64aa7808 X-Received: from 329c75b8d889.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 74E1FC93-57BD-4CEC-BF55-2A9E62069313.1; Fri, 22 Jan 2021 13:29:44 +0000 X-Received: from EUR03-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 329c75b8d889.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 22 Jan 2021 13:29:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j86I7Vi1hF+Jmzr9UChTaFkssTHNtanB6rfhBPbGS09tU94oqi3g8NX6b7p9vIFj/gsTfloxfwN9M7FwImOLwVnRx23LH4MRuE54OZuU9GNchsEhUHloSe4d07q6lWsTFxbJREVsFr9GVvOWc47qUb7q3BH1HsDai+/qVBh3wgVqMD8azaTMYX6+9nRqFvhySaGHWlTa278uXN3ruYjffcfqUa7aok/fTo5swiAy07LiYPaCYXERY6XKDO7prcPDwgQN2CZorLdVVJxvVPtHmsXMsCkTzKeHuDOeT9qE9rUu3pKJ5gzF5nc+y2/OzgF9MTgPWel7mok5XrQrJfxJyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=I4xb7j32SQgqiVfKCDIRcwW5IUaUQsxSFWOIm8kGHcg=; b=aR+4P2tQxiZkEr3MngiiZJRsl7edyX/R3URIYCKmI9iSGPhO7uMovHPb74dbWLtMxG8cj0FWqC6NSVeyl8DnPUtCfXPNYdd4jQotCJgNKfyYZ9RADxsZQ+fXntvt4sgKRbkggdB/0cGzMU+WtstdEpBAa0bt5WEVToPtIdY2Q5V4i+7jxXbjC8rYzG2WpjJWEFPHJeJQd6uecOwNY/CowOOzvlSNT3BiRcWp7S5m66Z9VPC05VhIYOrJv2YMeBN04pUjMAM/fJSBFhUx+QsX1k221X4tr9tuu+LwbDZp4o00zkyMYyLuJWYUX3gmHXgSZ2F40+r2fc2X4MOI1QBGkQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from DB6PR0202CA0001.eurprd02.prod.outlook.com (2603:10a6:4:29::11) by HE1PR0802MB2347.eurprd08.prod.outlook.com (2603:10a6:3:c8::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.15; Fri, 22 Jan 2021 13:29:41 +0000 X-Received: from DB5EUR03FT005.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:29:cafe::df) by DB6PR0202CA0001.outlook.office365.com (2603:10a6:4:29::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.11 via Frontend Transport; Fri, 22 Jan 2021 13:29:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass 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; X-Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT005.mail.protection.outlook.com (10.152.20.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3784.11 via Frontend Transport; Fri, 22 Jan 2021 13:29:41 +0000 X-Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2044.4; Fri, 22 Jan 2021 13:29:39 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1779.2; Fri, 22 Jan 2021 13:29:39 +0000 X-Received: from E107187.Arm.com (10.57.3.168) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2044.4 via Frontend Transport; Fri, 22 Jan 2021 13:29:38 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , Subject: [edk2-devel] [PATCH edk2-platforms v1 3/6] Platform/ARM: FVP: Fix serial port usage Date: Fri, 22 Jan 2021 13:29:32 +0000 Message-ID: <20210122132935.22484-4-sami.mujawar@arm.com> In-Reply-To: <20210122132935.22484-1-sami.mujawar@arm.com> References: <20210122132935.22484-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 01d81973-4360-414f-49f6-08d8bed9cb65 X-MS-TrafficTypeDiagnostic: HE1PR0802MB2347:|VI1PR08MB2640: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:9508;OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: E2dyjKQT3a2Yt+MjPcKbyuNPAYfL/F/eFQuXqmlo2CFCEAQA7xDwsZiejRDAOzrv9/RqFR+2gv2L5jGtLCa5ubZgWkMOHrs06hZm6a1DYzNPQUhPbdMyGHN+kpjo0Vh6E1QGHlVEbm6MTB2rmlf9CqYwFME7uxVBRT3kP+k+ie8LNi1ciBZTwbNWWOPhfk0+Va50YxEMvxqayGOzTguoY5VLWtOWZcx6Sh53QnNIAjIaHoYUwd04ae9y4UL1mi7Wr4mdZS/51y2LXz45inEnP0C7OkNdNryFHTPsmgNaMqL9iI8GaWbhfr4mVHAdJl4g2TJoH3M4Plz+00QBu0CoQjRndAtq2pz3l3tDFyU6uh3D6gt6pjxmYPzULMpi1JqNxFs1FsfKgeW++oSxpiiBANiWUZ31YZoDk/mioER+y/fwDrh1+Ty0j1P9Wz4btIpnRIxdPZy3Ek7N7vLwCCoD3N4EYlZfWbK5zEJm9EBQfENwxGudoK3oKS6sV5N2mkOQmJw5954RnG3oWkqLG/+Ok27glwJs3U5F3p1oSFvvw8LkmbAkLp4vbjykF1HGq+4BtbLas7DNaCxjO3zrv6Pry9BMZPhwjXaiITfb1GCiglf2UccCbVFgmzojlByxe5JQiS19bpvfrUDKmM1cvMTZow9B1nn6OBGW+7B0+FkaqPn4n60vJwCrYMQuUqcATQS68EIjwK00mgWMds1RI7HHRQ== X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(39840400004)(346002)(136003)(376002)(396003)(46966006)(6666004)(4326008)(86362001)(81166007)(82310400003)(356005)(6916009)(8676002)(44832011)(47076005)(336012)(36756003)(2616005)(426003)(966005)(83380400001)(186003)(26005)(2906002)(8936002)(316002)(478600001)(70206006)(70586007)(5660300002)(1076003)(7696005)(54906003)(36610700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2347 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT008.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 2ce35412-5b39-4d48-c600-08d8bed9c60f X-Microsoft-Antispam-Message-Info: w2oZnpqZxWgu+dmFNNINKJoyv+539nChGQ6XrM86MEZvMxVm7VQRjzQgbi4h1o9pq28leUpy1Or3Sg5hzWtmZYfMdmley41mr64e3zJlkKEinI1HQGkYNaAMgdSWnSDPBksYjdxgta2Yg2pzE4bhMLgn+LlPAsqFj5EZgZWXtNeTebSF+H5MMXJMPuFWD+io0saSf8Q16fERPuCXatsHTcB2s6vBto/DLi2o4vlcWT+bzsEG1xmk3sRLERttMp9aUG2JrOjw6TkOQBxU6399h+pnZlbOlzJL5aK8+bxkeaE3yagMhkgDYpC5JDqoxJEKPpNGutxXYWOZ+4sD96jTJNoCcoazhyad/IsZ3S9FeSIvF+JzWBodBgkdnX8SvD0b380C9mH63UpKCupUrz5U0nYbYqCfy390a01G/eZkXLxS5PLrxgo6MPYeHwRDIgtGWfpROkVvKDieseZSz45+h9zMq3C94RisEfi5qmrB2ZCKQy9qpLdjb8rRha36YdXgCxm2HjLJqg6/u4ZwdjLhAH/XqdWIrzBIJT/GfPkATaQ= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2021 13:29:50.2368 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 01d81973-4360-414f-49f6-08d8bed9cb65 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT008.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB2640 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,sami.mujawar@arm.com X-Gm-Message-State: 8vlgnV3EbEuos5mCwqwr9zX0x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1611322197; bh=LYJ+myTwBHhcSwSU1X2DmF1Ojc74ZIZ7xcf2VEUKTZg=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=kWI+eww43Pb9gunqk7uYSaB+ifiCbDCj0OWhCJUOneKKUhGYdcO0KbR44DMqM0k+Qes xWsF4ijiNJ4sNh6HOFOHjBPHqZlIEXXGj/gNKIwl+NG9BhEFg3kMC8/Jg4TsCoh0ekPsq LjMrAst4teKM+SV58kGOoy8R+9FL5bbUOFs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The serial ports on FVP are follows: UART# Address Interrupt No. ----- ------- ------------- UART0 0x1c090000 0x25 UART1 0x1c0a0000 0x26 UART2 0x1c0b0000 0x27 UART3 0x1c0c0000 0x28 See Fast Model Reference Manual at: https://developer.arm.com/documentation/100964/1113/ The FVP firmware configures the debug log output on UART1 and the UEFI shell is configured to use UART0. The Serial Port Console Redirector (SPCR) table is configured such that the UEFI shell is migrated to the OS serial console. When Dynamic Tables Framework is enabled, the FVP Configuration Manager uses the PCDs PcdSerialRegisterBase and PL011UartInterrupt to populate the SPCR table. The current firmware implementation has two problems: 1. The PL011UartInterrupt was not set to the correct interrupt number. Therefore, the OS serial console was not fully functional (serial output was printed but input could not be provided). 2. The OS serial console was setup on UART1, while it should have been UART0. Therefore, when Dynamic Tables Framework is enabled fix the UART base address and interrupt number such that UART0 is configured in the SPCR table. Also remove ConfigurationManager.dsc.inc as this is now redundant. Signed-off-by: Sami Mujawar Reviewed-by: Leif Lindholm --- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc = | 11 ++++++++--- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc= | 19 ------------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platfor= m/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc index a6f536a332281a624403dac2e4bf18aa9ba96d0b..f8c703c4b22b2a26028ba0562e0= eae5948c3292d 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -1,5 +1,5 @@ # -# Copyright (c) 2011-2018, ARM Limited. All rights reserved. +# Copyright (c) 2011-2021, ARM Limited. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -34,7 +34,6 @@ [Defines] !include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc !ifdef DYNAMIC_TABLES_FRAMEWORK !include DynamicTablesPkg/DynamicTables.dsc.inc - !include Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMana= ger.dsc.inc !endif =20 [LibraryClasses.common] @@ -126,7 +125,7 @@ [PcdsFixedAtBuild.common] gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x1c0a0000 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|0 - gArmPlatformTokenSpaceGuid.PL011UartInterrupt|0x25 + gArmPlatformTokenSpaceGuid.PL011UartInterrupt|0x26 =20 ## PL011 Serial Debug UART (DBG2) gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase|0x1c0b0000 @@ -267,6 +266,12 @@ [Components.common] !ifndef DYNAMIC_TABLES_FRAMEWORK MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf Platform/ARM/VExpressPkg/AcpiTables/AcpiTables.inf +!else + Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Co= nfigurationManagerDxe.inf { + + gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x1c090000 + gArmPlatformTokenSpaceGuid.PL011UartInterrupt|0x25 + } !endif =20 ArmPkg/Drivers/ArmGic/ArmGicDxe.inf diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= ager.dsc.inc b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationM= anager.dsc.inc deleted file mode 100644 index 0915c154cce6b0686f67a383dc69231ed3ed6f36..000000000000000000000000000= 0000000000000 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.ds= c.inc +++ /dev/null @@ -1,19 +0,0 @@ -## @file -# dsc include file for Configuration Manager -# -# Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.
-# -# SPDX-License-Identifier: BSD-2-Clause-Patent -## - -[Defines] - -[BuildOptions] -# Required for pre-processing ASL files that include ArmPlatform.h - *_*_*_ASLPP_FLAGS =3D $(PLATFORM_FLAGS) - -[LibraryClasses.common] - -[Components.common] - # Configuration Manager - Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Co= nfigurationManagerDxe.inf --=20 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#70687): https://edk2.groups.io/g/devel/message/70687 Mute This Topic: https://groups.io/mt/80029721/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Mon Apr 29 02:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+70685+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1611322201771104.0567276712951; Fri, 22 Jan 2021 05:30:01 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id TqEmYY1788612xUYBdB3I2RM; Fri, 22 Jan 2021 05:30:01 -0800 X-Received: from EUR04-VI1-obe.outbound.protection.outlook.com (EUR04-VI1-obe.outbound.protection.outlook.com [40.107.8.80]) by mx.groups.io with SMTP id smtpd.web12.8860.1611322195102932115 for ; Fri, 22 Jan 2021 05:29:55 -0800 X-Received: from MR2P264CA0115.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:33::31) by AM6PR08MB3174.eurprd08.prod.outlook.com (2603:10a6:209:45::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12; Fri, 22 Jan 2021 13:29:52 +0000 X-Received: from VE1EUR03FT046.eop-EUR03.prod.protection.outlook.com (2603:10a6:500:33:cafe::d8) by MR2P264CA0115.outlook.office365.com (2603:10a6:500:33::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.13 via Frontend Transport; Fri, 22 Jan 2021 13:29:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+70685+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT046.mail.protection.outlook.com (10.152.19.226) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.11 via Frontend Transport; Fri, 22 Jan 2021 13:29:51 +0000 X-Received: ("Tessian outbound 2b57fdd78668:v71"); Fri, 22 Jan 2021 13:29:51 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: f7e3e0dfbf3c31d3 X-CR-MTA-TID: 64aa7808 X-Received: from ad7eb1d16c34.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id E7FB6464-2D97-4377-BC4A-E7FFDCC36782.1; Fri, 22 Jan 2021 13:29:45 +0000 X-Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id ad7eb1d16c34.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 22 Jan 2021 13:29:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FK4jQj0BBkANkYleEqP80GlXaLs973PRoW/fVrwn277O1nXKPLL/PTOTClvVxQ6UwNLel3FuGgcH+Y4FJY4PQBYMesPKyjqXyU7mz/p06jVxX95dDlsLHNX1qI0kIETmQ5snmTJOwXIvjqbomL5RpImISf1U64Tqg9Jk3s3TQXjHjDviGmAvyxQYf5CqxlaxIFbkRAsiVxqE/NNkK/TpLA50KMkpAcjuG60FdIF6eJt892TYd+pUoNbCqsddhTwLOd0qnNxF/tj/CQtt5RpjN4ilPZj4IEuvz5vNHLFKxF5uTaumA2w4cLHvabG5jukZBk/khvXr0W82hV/CzHOxlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=py9e37kbMcQaLzDjl/jheljetRqxsWYnNCm1BMr9ffc=; b=Oy1B7NTsiXJ6ir14/5EwwnahgH75JdHlG0/bn0Gn4HpHCS8vnD/UVMsgez3ohBH/2Iyc5glZrt57Af620lddj9086ZNyCYApapNrHkjiTVLpb0pMumQjXpErXulUZPIWtHmzQH6iyV5W1HmwLhSs77krwf1Z2dcEQZayKUpe3AkmP7wiOsD0sQI7eXglN0UehI9MMjODJitpj4IfTC66OFLuvIzTkWM2B1Ykypw5AbebuWdcLheOMgAbm05dhcTtNXzrQIEMx/neKpthCF2vfJ5e/s+Oj52o1atEgBih0QOfThZhOZATaelbhgK3GU+jMPE5qgJzDck/BydIjnrPaQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from DB6PR0202CA0023.eurprd02.prod.outlook.com (2603:10a6:4:29::33) by AM0PR08MB4929.eurprd08.prod.outlook.com (2603:10a6:208:158::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12; Fri, 22 Jan 2021 13:29:43 +0000 X-Received: from DB5EUR03FT005.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:29:cafe::9a) by DB6PR0202CA0023.outlook.office365.com (2603:10a6:4:29::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Fri, 22 Jan 2021 13:29:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass 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; X-Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT005.mail.protection.outlook.com (10.152.20.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3784.11 via Frontend Transport; Fri, 22 Jan 2021 13:29:43 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) 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.2044.4; Fri, 22 Jan 2021 13:29:39 +0000 X-Received: from E107187.Arm.com (10.57.3.168) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2044.4 via Frontend Transport; Fri, 22 Jan 2021 13:29:39 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , Subject: [edk2-devel] [PATCH edk2-platforms v1 4/6] Platform/ARM: Juno: Remove PL050 KMI description from DSDT Date: Fri, 22 Jan 2021 13:29:33 +0000 Message-ID: <20210122132935.22484-5-sami.mujawar@arm.com> In-Reply-To: <20210122132935.22484-1-sami.mujawar@arm.com> References: <20210122132935.22484-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 379fea15-f4c3-484d-97e2-08d8bed9cc5c X-MS-TrafficTypeDiagnostic: AM0PR08MB4929:|AM6PR08MB3174: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:3631;OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: kLJWNK1ctLYp3Qn1dmR6yx+yKhDGBwMNG3q/P2jKf4aU5+DgLLdLSAdSTbenmCYc7pR5XIkTWeuAPAsI5wZmx9rqZ89tDT0tVDKlCsLl4MdI+7dsPnrS9LO39NcfrP4+1xNMdzfWhVoyD2m+y/Oub8NfJJb04Mk8N7omWDzsb57T6+amhDZ4QLHn817QUvNe6m0PGsnMOuOOdJasn7pvr48aw3heHWpGwkkaxkCw0RWqKqsIeUAYVRHddcbP2PLgoMkfczOHL3W2a3QZGzF7+tZLG2XziH62TwQ34SJs1owlxLPly3SeG++FuQkiqtO4Bh2Np1sZ7b4Q//6jMW54jsgN2Co9zjOO/LHY25wlyHVFkLATBNRP/HSaAaRgjXg4X+HiOPogE+d78MY3rBqLilatiFA/csVtQgUNz6deMbP2vwxhSjDT357ECBKqx4tM1+NCxlVs8ky60b6mnoqZ8FZidvB+ghWx+YwRyBanvDVkcY0Pa+boc/I4a4gjr94i X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(346002)(376002)(396003)(39850400004)(136003)(46966006)(82740400003)(8936002)(70206006)(70586007)(7696005)(8676002)(2616005)(336012)(316002)(54906003)(83380400001)(2906002)(186003)(426003)(36756003)(1076003)(26005)(6666004)(4326008)(86362001)(81166007)(356005)(47076005)(44832011)(5660300002)(82310400003)(478600001)(6916009)(36610700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB4929 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT046.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: c13f58bb-5986-4c56-d6c5-08d8bed9c78b X-Microsoft-Antispam-Message-Info: iUfliaXVrZyKx/rfRrb1QUe18ez7vP5tn/HEm53HBmBNhHg3sbZEhq6Ix/T8I+5NIFFiCNh8VgzGaT5eVjCMMhT03RZaZaIIz50QvHVSnCsdJnGtAcoiPICs9+mJOLvpUw4iPIbILYCC/cc8tLMLkvwKbZXMZyt886QZyd6RRL+BQAWfqFJZcc3b90mEgea8N7tszwSu009uXExIeRRPnYPG7qKdi3667f6O8ml2c2WyO4qHUUi0cWmpTYtGq+CO3BI76UdR0wv/pM/ufep9lDMqRKpEqagpFCe6hN3RcSHLcGjNhR41lJPP6LQ5LFbkU20bnmk0jIs8bObKaaQR5XBHsKbvtwhCyDnaTlQJe0OpCY4NhW7H0fV4qGz9c2a45wuKoaARW+uYsTUcfdMN8mPfiT7me9l78ab8S+U7sp4HLnZGSu9+2dSIm36h+h+t22GiLdItzms9KFABt83OBg== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2021 13:29:51.7396 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 379fea15-f4c3-484d-97e2-08d8bed9cc5c X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT046.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3174 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,sami.mujawar@arm.com X-Gm-Message-State: mV6yQO11QnTSerylAU8Y5hjCx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1611322201; bh=sAxcBH69qhY1e68/LUXPoEKpXOI1mB/k0a/tWcmodPQ=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=eXsL3fTO4HvauNCWbFFc9iMD3BAbFo2gdggJ29Szo1X7RWiE5Xpqkrp/SgDgy9vvLE7 W+ktPHJ42d4FwbBwyl1EQN44Xpfta8eVP4lKuyQSlrfW+gYSGA3VAaYGnSsrs7zWlBOcS Pdf33kYq+Foba459moGbzwRBgS/6dzqpA1U= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the PL050 PS/2 Keyboard/Mouse Interface (KMI) controller description from the Juno DSDT as: - PS/2 ports are now considered as legacy ports. Alternatively, a USB Keyboard/Mouse can be connected to Juno USB ports. - Concurrent usage of the Juno KMI and USB appear to trigger I/O errors from the USB mass storage driver. This has proven to be problematic as USB drivers typically cannot recover from this issue. Signed-off-by: Sami Mujawar Reviewed-by: Leif Lindholm --- Platform/ARM/JunoPkg/AcpiTables/Dsdt.asl = | 16 +--------------- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTable= s/Dsdt.asl | 16 +--------------- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/Platform/ARM/JunoPkg/AcpiTables/Dsdt.asl b/Platform/ARM/JunoPk= g/AcpiTables/Dsdt.asl index 186fd6a471b45f43f407a620c1316c4b1006fba1..c17c74e174081836a61106224b6= 87621854bcd29 100644 --- a/Platform/ARM/JunoPkg/AcpiTables/Dsdt.asl +++ b/Platform/ARM/JunoPkg/AcpiTables/Dsdt.asl @@ -1,7 +1,7 @@ /** @file Differentiated System Description Table Fields (DSDT) =20 - Copyright (c) 2014-2018, ARM Ltd. All rights reserved.
+ Copyright (c) 2014-2021, ARM Ltd. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -233,20 +233,6 @@ DefinitionBlock("DsdtTable.aml", "DSDT", 1, "ARMLTD", = "ARM-JUNO", EFI_ACPI_ARM_O } =20 // - // Keyboard and Mouse - // - Device(KMI0) { - Name(_HID, "ARMH0501") - Name(_CID, "PL050_KBD") - Name(_CRS, ResourceTemplate() { - Memory32Fixed(ReadWrite, 0x1C060008, 0x4) - Memory32Fixed(ReadWrite, 0x1C060000, 0x4) - Memory32Fixed(ReadOnly, 0x1C060004, 0x4) - Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive) { = 197 } - }) - } - - // // LAN9118 Ethernet // Device(ETH0) { diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager= Dxe/AslTables/Dsdt.asl b/Platform/ARM/JunoPkg/ConfigurationManager/Configur= ationManagerDxe/AslTables/Dsdt.asl index 6c045083873eecb02c7d3b4e25e8c28948f796af..63c70c1e4f060d089a3a02aee36= a7e9cbf6ae6b0 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Asl= Tables/Dsdt.asl +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Asl= Tables/Dsdt.asl @@ -1,7 +1,7 @@ /** @file Differentiated System Description Table Fields (DSDT) =20 - Copyright (c) 2014 - 2019, ARM Ltd. All rights reserved.
+ Copyright (c) 2014 - 2021, ARM Ltd. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -233,20 +233,6 @@ DefinitionBlock("DsdtTable.aml", "DSDT", 1, "ARMLTD", = "ARM-JUNO", EFI_ACPI_ARM_O } =20 // - // Keyboard and Mouse - // - Device(KMI0) { - Name(_HID, "ARMH0501") - Name(_CID, "PL050_KBD") - Name(_CRS, ResourceTemplate() { - Memory32Fixed(ReadWrite, 0x1C060008, 0x4) - Memory32Fixed(ReadWrite, 0x1C060000, 0x4) - Memory32Fixed(ReadOnly, 0x1C060004, 0x4) - Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive) { = 197 } - }) - } - - // // LAN9118 Ethernet // Device(ETH0) { --=20 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#70685): https://edk2.groups.io/g/devel/message/70685 Mute This Topic: https://groups.io/mt/80029719/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Mon Apr 29 02:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+70686+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1611322206551683.3618715193392; Fri, 22 Jan 2021 05:30:06 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id xErqYY1788612xXpk5JHKStV; Fri, 22 Jan 2021 05:30:06 -0800 X-Received: from EUR01-DB5-obe.outbound.protection.outlook.com (EUR01-DB5-obe.outbound.protection.outlook.com [40.107.15.87]) by mx.groups.io with SMTP id smtpd.web08.8873.1611322195183273497 for ; Fri, 22 Jan 2021 05:29:55 -0800 X-Received: from AM5PR0201CA0023.eurprd02.prod.outlook.com (2603:10a6:203:3d::33) by VE1PR08MB5247.eurprd08.prod.outlook.com (2603:10a6:803:10d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12; Fri, 22 Jan 2021 13:29:52 +0000 X-Received: from VE1EUR03FT039.eop-EUR03.prod.protection.outlook.com (2603:10a6:203:3d:cafe::28) by AM5PR0201CA0023.outlook.office365.com (2603:10a6:203:3d::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Fri, 22 Jan 2021 13:29:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+70686+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT039.mail.protection.outlook.com (10.152.19.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.11 via Frontend Transport; Fri, 22 Jan 2021 13:29:52 +0000 X-Received: ("Tessian outbound 587c3d093005:v71"); Fri, 22 Jan 2021 13:29:51 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 892b8120792c9d4d X-CR-MTA-TID: 64aa7808 X-Received: from 62c0f0959067.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id FF617CC0-6621-4037-A4A9-9F5E56E23B7A.1; Fri, 22 Jan 2021 13:29:45 +0000 X-Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 62c0f0959067.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 22 Jan 2021 13:29:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bagMDmUJAnXAatkBW3ZpXbBaxMOxok6RmbYmRjoLPZrFWk7YUIdbHz9mvXNR5u3FSSen9CNHJucIkKyE9pcRVi7mYuz0FiOTM0nv3AT/6cuBfpYIBHWqXnJn3NfeBax5w2/kmkT+mjZzO9y1hdzmPdaDXwzpp6L9hrx+FqmcO09G9NaL8LxIej+qym7iJwzFk8vcxII4pL4FoL5BFZqFNLo75DfdzN2xT/ctFmkcPer6edmWHz6ZN2UjQc+LDcVBnVCbMFEXpVUmDs+YIau4RLDPYt1CO7Q0U029Rq7TuwVQSi1F/zYUBuqVSUR/aq1a1B0Rv4v44kYUw1PeleKG4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1q99Xos4ldBimUGRd441XOTGDi+/HNgrn0Lr7kl9ZHk=; b=lJ7TpQkqSNNpl1AOiIM18wHk47NCQnoZgMt3R32Jtq56aAG1kmOeaMt6YLJwafyPY80VO+zDYkJ1MG+qPmc3I0dI4JT9hgmJKKQuL7wICSF5QS2QfF9MmiiI9vRTIOl6D513gZoVriC+V+UzP4dAHGQ+2FV97M0mBq1mwq5ypZEFdSdfo9vazo5RcA3WHXCQvK9dLKNH+xjaupGJY8B5frRYtL/2ttOIB9a354BKxOPBgtxbxfCLtqDS+YYHZgAGqnl+qrd2lj/Wt6jDCr/iQmOiPTxZtkc3T2sswJH3m+p2X/WsADW0GN6V807I1khozt4n+U0eTZNXATN3POBSkQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from AM6PR0202CA0067.eurprd02.prod.outlook.com (2603:10a6:20b:3a::44) by DBBPR08MB4458.eurprd08.prod.outlook.com (2603:10a6:10:c8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.10; Fri, 22 Jan 2021 13:29:43 +0000 X-Received: from VE1EUR03FT057.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:3a:cafe::69) by AM6PR0202CA0067.outlook.office365.com (2603:10a6:20b:3a::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Fri, 22 Jan 2021 13:29:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass 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; X-Received: from nebula.arm.com (40.67.248.234) by VE1EUR03FT057.mail.protection.outlook.com (10.152.19.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3784.11 via Frontend Transport; Fri, 22 Jan 2021 13:29:42 +0000 X-Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2044.4; Fri, 22 Jan 2021 13:29:40 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1779.2; Fri, 22 Jan 2021 13:29:40 +0000 X-Received: from E107187.Arm.com (10.57.3.168) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2044.4 via Frontend Transport; Fri, 22 Jan 2021 13:29:39 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , Subject: [edk2-devel] [PATCH edk2-platforms v1 5/6] Platform/ARM: Juno: Remove Serial port SSDT Date: Fri, 22 Jan 2021 13:29:34 +0000 Message-ID: <20210122132935.22484-6-sami.mujawar@arm.com> In-Reply-To: <20210122132935.22484-1-sami.mujawar@arm.com> References: <20210122132935.22484-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e6604c52-adc3-422c-0add-08d8bed9cca7 X-MS-TrafficTypeDiagnostic: DBBPR08MB4458:|VE1PR08MB5247: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:8882;OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Ud8uYK61Ysspd5VftWy7kOwEdPbpJ/BOab8SrmAWYYroFQjdQ6+AT+PLVjd9DWeJcyoyeDBD4V19lOqQKX/znpPewlERSZts148qHHQ9U7Dlwh9BfwbdflXDH2X2Gxbxf1cimu7K+TFPEc0m065F1TZyNL+8usGFa5FvQ97XkPfMmCimzNHCZtkoSFeDMRX/P9KD3IP7ckHPafGJpGVSxXa1Vau4yBh3WH9Envk3/B7w+wdO7/1wM0t6DMQ6S8E5Gj3wiaV+QUhU7FPgl0Tji8AxjeExNHJZp1Mrr0mnf6N/SMGwLNLLmFBfrUksnmFGYzvtwmSFuqGSU4CJKA1BZHu41uwFkfNuVjBe3zsj5FTWm2hWhgM9tnbIpFgDtSfIM+aJm0B6JdXHJTiVray7q48eXE/erYLs0Sy4DhudKHlkuWtAHRDeUkAxPGVCHbmQS3vRx67k3aWIMjoQuuX397NRyH4cXtiiVmM9C3m32fhB6t3ZyQL6T6nzA+59afV6 X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(396003)(376002)(39850400004)(346002)(136003)(46966006)(2906002)(82310400003)(83380400001)(336012)(8676002)(86362001)(186003)(356005)(26005)(478600001)(82740400003)(8936002)(81166007)(54906003)(5660300002)(70206006)(47076005)(1076003)(6666004)(7696005)(36756003)(70586007)(426003)(316002)(6916009)(2616005)(4326008)(44832011)(36610700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4458 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT039.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 2e9bd59a-6987-449e-b553-08d8bed9c6b4 X-Microsoft-Antispam-Message-Info: M0HEx6tis+GZQS6N4QDfRnOXr0ooTWrV/ZShJwd8FohDwLIKu4Wz/bQPCXSIvW40hnI08O610bbxWq+ZxslRJgrA8eYZJpDo+dMrvbwhJiUuTd32vrYqfuFelf2PVtnFC/66ZEZMXjMDuGuXfrBM6PterQxbzA1JDOSiCzTRT+62NVgosbwvO/4m74/BkYywpCD1sxs4EQ3D8iGgqefqsm6EKlg6f3wr36WVzkZpwFwmVM/dwwvhTw2RsW2aRUFt2fgIQMgVSE6WFlOUHvBKVulJFNcGveNVscqLq7fcIw/39x8GkqNngFZI5fkKpnCf5sOUUXOIeLyX+HtK6flPqFLR/t5nP0K0QCebZNyiVvN7IBMdYCmqcoHcYBRSX/ZdZv2EUCPG7FE6z6c1EDaLCkUe8Ayiedzo6lkRTuzKX7hEBiy/Fickl0023tfXINEup+PYT2OAKWQKdEJbACUmHA== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2021 13:29:52.2245 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e6604c52-adc3-422c-0add-08d8bed9cca7 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT039.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB5247 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,sami.mujawar@arm.com X-Gm-Message-State: 3mkzPHVPLMtHeNbBRKgzofeNx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1611322206; bh=qPBmfwEHsNPhTWphsIl3lMjaFuPgVJOwEnXDFai1vms=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=iCtlEUsku3vI/w+L57QJWeqnTWIS9F5amZxEY9OFbtq6GALJpeYvqrzrJa5hu6x8iKi MTPHExo/aOCgtY9mIlkSxYz4xvNWNTTWsNY5Op66uaCOUv66etnVaZI7/88qt5ZL35rcL J9M98UdsuNb9q4TLYEPRjSXUZNyajaSr0fY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Dynamic Tables Framework has been updated to add support for Dynamic AML. The SPCR and DBG generators have also been updated to dynamically generate the AML description for the Serial Ports. Therefore, the SSDT serial port description is redundant when Dynamic Tables Framework is enabled, so remove it. Signed-off-by: Sami Mujawar Reviewed-by: Leif Lindholm --- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTable= s/SsdtUart.asl | 42 -------------------- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Configur= ationManager.c | 7 ---- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Configur= ationManager.h | 3 +- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Configur= ationManagerDxe.inf | 3 +- 4 files changed, 2 insertions(+), 53 deletions(-) diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager= Dxe/AslTables/SsdtUart.asl b/Platform/ARM/JunoPkg/ConfigurationManager/Conf= igurationManagerDxe/AslTables/SsdtUart.asl deleted file mode 100644 index 55a7ffc83fd6bb44ed9b9ca8b0a53e757aa2dd58..000000000000000000000000000= 0000000000000 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Asl= Tables/SsdtUart.asl +++ /dev/null @@ -1,42 +0,0 @@ -/** @file - SSDT for UART - - Copyright (c) 2014 - 2019, ARM Ltd. All rights reserved.
- SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ -#include "ArmPlatform.h" - -DefinitionBlock("SsdtUart.aml", "SSDT", 1, "ARMLTD", "ARM-JUNO", EFI_ACPI_= ARM_OEM_REVISION) { - Scope(_SB) { - // UART PL011 - Device(COM2) { - Name(_HID, "ARMH0011") - Name(_CID, "PL011") - Name(_UID, Zero) - - Method(_STA) { - Return (0xF) - } - - Method(_CRS, 0x0, NotSerialized) { - Name(RBUF, ResourceTemplate() { - Memory32Fixed( - ReadWrite, - FixedPcdGet64 (PcdSerialRegisterBase), - 0x1000 - ) - Interrupt( - ResourceConsumer, - Level, - ActiveHigh, - Exclusive - ) { - FixedPcdGet32 (PL011UartInterrupt) - } - }) - Return (RBUF) - } - } - } -} diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager= Dxe/ConfigurationManager.c b/Platform/ARM/JunoPkg/ConfigurationManager/Conf= igurationManagerDxe/ConfigurationManager.c index 8d92a8a666af4c5555343a929cb2d5063e54ffd5..80a98a10d869d48fc768db7bf5b= fccb41f483fc3 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.c +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.c @@ -83,13 +83,6 @@ EDKII_PLATFORM_REPOSITORY_INFO ArmJunoPlatformRepository= Info =3D { CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdSsdt), (EFI_ACPI_DESCRIPTION_HEADER*)ssdtjunousb_aml_code }, - // SSDT table describing the PL011 UART - { - EFI_ACPI_6_2_SECONDARY_SYSTEM_DESCRIPTION_TABLE_SIGNATURE, - 0, // Unused - CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdSsdt), - (EFI_ACPI_DESCRIPTION_HEADER*)ssdtuart_aml_code - }, // PPTT Table { EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_SIGNATURE, diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager= Dxe/ConfigurationManager.h b/Platform/ARM/JunoPkg/ConfigurationManager/Conf= igurationManagerDxe/ConfigurationManager.h index f382c7f967420c4fa8f272f3fee5c8f191999b23..771b00c31b9e168d2b416a87b87= 43d2e063f1744 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.h +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.h @@ -19,7 +19,6 @@ extern CHAR8 dsdt_aml_code[]; extern CHAR8 ssdtjunousb_aml_code[]; extern CHAR8 ssdtpci_aml_code[]; -extern CHAR8 ssdtuart_aml_code[]; =20 /** The configuration manager version */ @@ -116,7 +115,7 @@ typedef EFI_STATUS (*CM_OBJECT_HANDLER_PROC) ( =20 /** The number of ACPI tables to install */ -#define PLAT_ACPI_TABLE_COUNT 11 +#define PLAT_ACPI_TABLE_COUNT 10 =20 /** The number of platform generic timer blocks */ diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager= Dxe/ConfigurationManagerDxe.inf b/Platform/ARM/JunoPkg/ConfigurationManager= /ConfigurationManagerDxe/ConfigurationManagerDxe.inf index a3e7db12f8c913f7111b5ff4ad724a5bdcc35956..00be2c435bd6eefe4b26017608b= 62f085bb2d7f7 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManagerDxe.inf +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManagerDxe.inf @@ -1,7 +1,7 @@ ## @file # Configuration Manager Dxe # -# Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2017 - 2021, Arm Limited. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent ## @@ -25,7 +25,6 @@ [Sources] AslTables/Dsdt.asl AslTables/SsdtJunoUsb.asl AslTables/SsdtPci.asl - AslTables/SsdtUart.asl =20 [Packages] ArmPkg/ArmPkg.dec --=20 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#70686): https://edk2.groups.io/g/devel/message/70686 Mute This Topic: https://groups.io/mt/80029720/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Mon Apr 29 02:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+70683+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1611322200082698.241339551844; Fri, 22 Jan 2021 05:30:00 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id aIIkYY1788612xzva8mXaftN; Fri, 22 Jan 2021 05:29:59 -0800 X-Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.61]) by mx.groups.io with SMTP id smtpd.web08.8872.1611322193899513692 for ; Fri, 22 Jan 2021 05:29:54 -0800 X-Received: from DB6PR0402CA0005.eurprd04.prod.outlook.com (2603:10a6:4:91::15) by VI1PR08MB3390.eurprd08.prod.outlook.com (2603:10a6:803:7d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.13; Fri, 22 Jan 2021 13:29:51 +0000 X-Received: from DB5EUR03FT003.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:91:cafe::ba) by DB6PR0402CA0005.outlook.office365.com (2603:10a6:4:91::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Fri, 22 Jan 2021 13:29:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+70683+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT003.mail.protection.outlook.com (10.152.20.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.11 via Frontend Transport; Fri, 22 Jan 2021 13:29:51 +0000 X-Received: ("Tessian outbound 587c3d093005:v71"); Fri, 22 Jan 2021 13:29:51 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: ee244e817462d567 X-CR-MTA-TID: 64aa7808 X-Received: from d82bfe94e9cd.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id D101DAA8-D99A-4191-98D2-5282875DD00F.1; Fri, 22 Jan 2021 13:29:45 +0000 X-Received: from EUR04-DB3-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id d82bfe94e9cd.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 22 Jan 2021 13:29:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OJ9RjT863r87b1BjijaZuPMyY11M1tIneqalzZxP/Pe7swLtySSwBOZnx/JhqShgvNvUU0DryvRXqiNsdJ8arqcb5o3sAkhVGW6+mQexshoOlhmnCogtMhLmj66VPTO44JBRFVCgo6FIiNUln8kGn49O0eY8D7LHZhVohQIsg3FfFLSY1qicD3LAOFkNo/ByXe3OjQml+2r+pXMK4Tba+F7mrbxHm23caMQwg6DEdZDB1bLzlpXZle9I5qTa03HsgQxuF+gRRr6nOq6bbM+pJCG2TU7KH9s3i+Thtl6DpZ5t4ZV7+MxhPgKQuu95L2wttnNAzn00gWl6hH0BuD5DWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=i2Jkdlk9e3KlNM80iL2WYv+eEf5i/CinCv/50Ab6ncI=; b=e6i6FZC03YEAZK3QGsd80z9uxfEgCk7XUw/onX2xlTyPV7ULYs5WjQpnnD5IVYsiMrYm4RSBQocGBkk/YzqE279SwUCk3qKWt4tTpSh8X/FFiXcZwKc2zjFnrcWDRXEjPh2Vg9mTx6h9UrAH0RJcs1E9glhVN+XTbIvkFx6ODCYFdBERJTWA2PtLbPTdbOlcVYVtK+zwj4kgfXUgNLYOR1rtaIRnUE5PiKoaTJVzYD5FxIkR2bSGRIKSl7mqvv6JDyk8vxdNMuvJdrXeyaMGj1RAMk+da5ssGb1lKCeA7UIwfZAXXMZGkHioCnoHfouGHGFrotJVFttThaq2cJfFKQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from DB6PR0202CA0006.eurprd02.prod.outlook.com (2603:10a6:4:29::16) by VI1PR0801MB1726.eurprd08.prod.outlook.com (2603:10a6:800:52::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.11; Fri, 22 Jan 2021 13:29:44 +0000 X-Received: from DB5EUR03FT005.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:29:cafe::e5) by DB6PR0202CA0006.outlook.office365.com (2603:10a6:4:29::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.14 via Frontend Transport; Fri, 22 Jan 2021 13:29:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass 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; X-Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT005.mail.protection.outlook.com (10.152.20.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3784.11 via Frontend Transport; Fri, 22 Jan 2021 13:29:44 +0000 X-Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2044.4; Fri, 22 Jan 2021 13:29:41 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1779.2; Fri, 22 Jan 2021 13:29:41 +0000 X-Received: from E107187.Arm.com (10.57.3.168) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2044.4 via Frontend Transport; Fri, 22 Jan 2021 13:29:40 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , Subject: [edk2-devel] [PATCH edk2-platforms v1 6/6] Platform/ARM: FVP: Remove Serial port description from DSDT Date: Fri, 22 Jan 2021 13:29:35 +0000 Message-ID: <20210122132935.22484-7-sami.mujawar@arm.com> In-Reply-To: <20210122132935.22484-1-sami.mujawar@arm.com> References: <20210122132935.22484-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 144482f1-77a0-46fc-5312-08d8bed9cbe7 X-MS-TrafficTypeDiagnostic: VI1PR0801MB1726:|VI1PR08MB3390: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:6108;OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: AYl7ZmM2yaqXC5+FhLxPyjLoy9YDnCOwYL+uk43Bh7PSLkdGnjM1TYYjXTNg3aZAre+tbuczT3VB4DJ4w63KnKkd8kiwMhIosf7zZCvFh8j6KTXdmDAx5ZLqT+l22XRU3blP1p1WpjFEDg41Lo4dKDM2x6nYP40OC2M7ez7CIsMK8/lrboh6SbZ1jMpTir6VuktJWxPc3nns70X3btMqh2YoyPdnFs2GWHs8Gvt9+iVUDGWcPVIgLHVWszB7HNQvVwHiloFHKAQOscOEfEUfMypoL7sJfWAeSdOCLKdJFwParQe60zdb4QQ6cvzFeld46ZXbrm6V5+j7C1QWzzboeEngQ95F7hCSYGwX61GargD9Vksk3E3/E/dPsnX4poZJwup8Rxi4h+ft30/ajTl3t81qlSQYhpc0mtGg32M1HnV0IwwhImcNRdEIPsUKBxE2mrL2HzbdLhTDuBkqqXeNH/xw+0jXhoE5WUSsvIFpRfv1Aq8T3c3pWk3AwuKcJNht X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(136003)(346002)(376002)(39850400004)(396003)(46966006)(70586007)(82310400003)(44832011)(2616005)(70206006)(81166007)(82740400003)(86362001)(36756003)(83380400001)(356005)(5660300002)(8936002)(6916009)(26005)(336012)(6666004)(4326008)(2906002)(1076003)(186003)(7696005)(426003)(54906003)(478600001)(47076005)(8676002)(316002)(36610700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1726 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT003.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 9f9e3099-db3f-4340-defa-08d8bed9c7f1 X-Microsoft-Antispam-Message-Info: SXMvJNorO5XbaXx2A7s0Hbqs6mz/bu5FnVoWNIvywSN+pzGDO6y2VLAb6ITMcwRhednqlErb0L6Yn5uLKzaDVKEwvH99wD76q30OpcBXErVIMOBoStLYxVgXADNPARs6F/0WJ6LW3k7JLflfbxWvbvyZ11OkyUPqPPS7ax2WAG3ESMHYiidrdI7dUh4pvYa+lKosEKsOnKifeXu7ju+Cfj8CfI3QkeKOtyGr/S+BJQiOu5tl3IkTgrpmzyV1x0aG3hh7T0Ockn81JxXppYl22M3NQVjDM2shp6uX/sypSoKAgAMJTd6dbEpIxONtRuo1fTYFpm4gk2uyiRaGsxWR32S6j4x/nSsNBawhXUC/SQ+uXXLLlkV5hZuWaMi1d+L9KoEjmtz3sBUqh1l+MSMWxlJ4qi42waA2b+BwtB0be75DNqIfGPqHDnG8dZla2ggdNHlyxqHBb+zGC73MZu/hMA== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2021 13:29:51.0970 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 144482f1-77a0-46fc-5312-08d8bed9cbe7 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT003.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3390 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,sami.mujawar@arm.com X-Gm-Message-State: ZWUiXSbzsfzpdD27jF0LUK6hx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1611322199; bh=Tz2PYEQuo6vfL9VBcC8G28E3Fy8Fa6hT6veXsNIt7bo=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=KTEQ3Wrk0VSDXUewiQ8VDtYsgvRVdGlLq0E5Zj/b5uczzj4Et3d6FGs1HrX+meYsinY Mggmkurk8nBcbY5kWTU8S65tsKFSE/cNf3tyU0ILJWCbNVn5Vs4BL7hkeQXSIvr3Z2u7F zdZLrUZZmRFcwH1cytAfI1eBJ64JR4AlNyQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Dynamic Tables Framework has been updated to add support for Dynamic AML. The SPCR and DBG generators have also been updated to dynamically generate the AML description for the Serial Ports. Therefore, the serial port description in the DSDT is redundant when Dynamic Tables Framework is enabled, so remove it. Signed-off-by: Sami Mujawar Reviewed-by: Leif Lindholm --- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/AslT= ables/Dsdt.asl | 22 +------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/AslTables/Dsdt.asl b/Platform/ARM/VExpressPkg/ConfigurationManager/= ConfigurationManagerDxe/AslTables/Dsdt.asl index 9192a0070772209e5cec8d7d9a71ea7a9e10aa69..eb5466229d1f10f465ca417166d= e5c1c1ea212e8 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /AslTables/Dsdt.asl +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /AslTables/Dsdt.asl @@ -1,7 +1,7 @@ /** @file Differentiated System Description Table Fields (DSDT) =20 - Copyright (c) 2014-2017, ARM Ltd. All rights reserved.
+ Copyright (c) 2014-2021, ARM Ltd. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -43,25 +43,5 @@ DefinitionBlock("DsdtTable.aml", "DSDT", 1, "ARMLTD", "A= RM-VEXP", 1) { Name(_HID, "ACPI0007") Name(_UID, 7) } - - // UART PL011 - Device(COM2) { - Name(_HID, "ARMH0011") - Name(_CID, "PL011") - Name(_UID, Zero) - - Method(_STA) { - Return(0xF) - } - - Method(_CRS, 0x0, NotSerialized) { - Name(RBUF, ResourceTemplate() { - Memory32Fixed(ReadWrite, 0x1c090000, 0x1000) - Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x25= } - }) - Return (RBUF) - } - } - } // Scope(_SB) } --=20 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#70683): https://edk2.groups.io/g/devel/message/70683 Mute This Topic: https://groups.io/mt/80029716/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-