From nobody Sun May 19 07:12:05 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+108594+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 1694609591535829.568081410264; Wed, 13 Sep 2023 05:53:11 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=7HDxOVfnfgpgjqrHfCarmNPW3+CO16hHXTwLG4MpVo8=; c=relaxed/simple; d=groups.io; h=Received-SPF:ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Received-SPF:From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:NoDisclaimer:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type; s=20140610; t=1694609591; v=1; b=imm30ZOLGsBT4ZcbrjT91xNokumogHoIli2ID5k9b0DEWFUJALIKGdMyBkPeMbynYqDCnG3I iIZXc/Qu0tUZ+di3snAMamCV72fbKywBQNwMcxui2NZDlZXpAJ/gTc57+sbxyLi2iabZehuQnvy pqE1X06Sqe2FBjt0A6mid6n0= X-Received: by 127.0.0.2 with SMTP id j5FeYY1788612x8MH4JW5KcA; Wed, 13 Sep 2023 05:53:11 -0700 X-Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.74]) by mx.groups.io with SMTP id smtpd.web11.11062.1694609590489391582 for ; Wed, 13 Sep 2023 05:53:10 -0700 X-Received: from DB7PR03CA0105.eurprd03.prod.outlook.com (2603:10a6:10:72::46) by DU0PR08MB9251.eurprd08.prod.outlook.com (2603:10a6:10:41a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Wed, 13 Sep 2023 12:53:04 +0000 X-Received: from DBAEUR03FT006.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:72:cafe::18) by DB7PR03CA0105.outlook.office365.com (2603:10a6:10:72::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19 via Frontend Transport; Wed, 13 Sep 2023 12:53:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;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+108594+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; pr=C X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DBAEUR03FT006.mail.protection.outlook.com (100.127.142.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19 via Frontend Transport; Wed, 13 Sep 2023 12:53:03 +0000 X-Received: ("Tessian outbound 5c548696a0e7:v175"); Wed, 13 Sep 2023 12:53:03 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: b45760fcb2533d84 X-CR-MTA-TID: 64aa7808 X-Received: from bb834e847d9c.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 613AAD4E-3A1D-46FB-9509-6055046D061B.1; Wed, 13 Sep 2023 12:52:56 +0000 X-Received: from EUR03-DBA-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id bb834e847d9c.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 13 Sep 2023 12:52:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L9/1iHUaTbeGMeQYlb5Gl6B4vDDpJY3U4ZLcuqsiJASt6XLOlgWQkfxXCCnhCz7utfid6q3kCmDYoR5KBXXLQSF3XU1q+9if7M2XM3ne3m/wGlQH8vIA4cJreUIAW+/RHpsiBpJc0IcCcZQwo/ua97OBFvtvqG2SvXACSRH00aVDg9TNK1xOvOcX1iypkPirPmpoB5KTJK7e0nOSiVS5DdceM5hCxnYLv/XVeOrfrT+5ZXS1PU03rVUqTIJfQbh95tmilyvdjWwVfbQvNZIaXAB/jiJ868OcyBRsBWavBDLJ7HwhADq1lPDS27R1EUXqAVC2p+IrXepMXOM8LC+oow== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RipHvrsyK4+uVsRplA1O0up5k7fYfyRneQpPd1hffnQ=; b=gaxxTfrUjzmebw0veLZcuuftQAM7r7ykySQFH3vJL3w4Ndxm7QftC3iqpMNJGrPO+jirSmp9d+yPeJ3V4VJ7Rt525wJwMM5svG+S47UTPsSNNe66SrapvA0DpB/B38hvpbRWzeauYQ6JdH/E12bSXHh4qWS3aneJ/nbOfXm+jSBzXZ6o6RUdWAuG8j6DraYz3C/VVJUlW15PvSKwcMhIepiDCFYr/X39WETkTeahUdIqeRFJ7dtcKQ7IHSf0NDyjbhaRWMSXhKEQyOGZo0iW+os2J5N8avVaYnLiHrParPJY3qjBqxFmgzOe7Q4TTNrmCzUEHqITj8dcfoqkDQbsyQ== 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 DUZPR01CA0113.eurprd01.prod.exchangelabs.com (2603:10a6:10:4bb::6) by PA4PR08MB6287.eurprd08.prod.outlook.com (2603:10a6:102:ef::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19; Wed, 13 Sep 2023 12:52:50 +0000 X-Received: from DBAEUR03FT035.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:4bb:cafe::c6) by DUZPR01CA0113.outlook.office365.com (2603:10a6:10:4bb::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19 via Frontend Transport; Wed, 13 Sep 2023 12:52:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;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; pr=C X-Received: from nebula.arm.com (40.67.248.234) by DBAEUR03FT035.mail.protection.outlook.com (100.127.142.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6792.19 via Frontend Transport; Wed, 13 Sep 2023 12:52:49 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Wed, 13 Sep 2023 12:52:48 +0000 X-Received: from E114225.Arm.com (10.1.196.36) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Wed, 13 Sep 2023 12:52:48 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , , , , Subject: [edk2-devel] [PATCH edk2-platforms v2 1/3] Platform/ARM: Add dynamic CPU node generation for FVP Date: Wed, 13 Sep 2023 13:52:45 +0100 Message-ID: <20230913125247.34748-2-sami.mujawar@arm.com> In-Reply-To: <20230913125247.34748-1-sami.mujawar@arm.com> References: <20230913125247.34748-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: DBAEUR03FT035:EE_|PA4PR08MB6287:EE_|DBAEUR03FT006:EE_|DU0PR08MB9251:EE_ X-MS-Office365-Filtering-Correlation-Id: 13439fea-4478-4fc6-17f0-08dbb4585e88 x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: DvvIOiU6scU99oa4p0vOj3179jCWTJNNReTakZc/VOl53gJQX3yIZhBatsFfWetIl5NAqvOkOaNcu8SBAHw2ADGmsjupt+Ri8fQiQS/2P5o5byN9x0IBUh6biqsLOgN3jugLrgkaEjx0Aln9CcuD37SxnDD3ztTLJ52Mxfkn0RGEqFTDUQoojlqgei6zSzT/v25Pjul6mB0h2j8Ti4VTG8yRVWT5p2FdPMjfY5bgWbExYpGR90W0ZvYSlD1wVXtTusYYMnQ3w+eG61YLQJwOa0mzllO4LLyNTwiFAmBds5kL3fTcEJbvqJNLkwnzkws6CWYMW4LuyGbZTONo4hQKD1s8LmciMQlocLFB3/JWxMKLLbnJANkvJBVN2+rG6NwgncjuGLuvf39bwAVBJBDJiBV9OdjV6afD6+xwg+8YDj0wADwMJ5X4j9xppsa1K9ACw+C4jFjrrZSLBFBrivLrmk1Kq5x48rbiX/UIJzlawf8jRhM0tPgkYLbt0SN997q//88Cq2h53qITugEv8vu6V28WFfyx+7PlGf/AHW/izbI0Ipki5/EzSNMPxcZGzdKMlZ35MONy8WG3k8cjIv0aYizB5S2sYWibmAyR9jHy4tV/ssrkmgJhguzkq5PRbd6K+65NMEBbcxGH4qS0lD06qKvqWIsI8wgUfFBcSIc3V8IsXRL4iucwD+2vqocltWpoHgnHEDE82cUrKEpp8nqz7IqwW5llWRfUPLRn9+WeQfOfauEUjLS2En78/IvWuKBHZqCiV+s0vKqY3K0Ze2mqGQ== 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:(13230031)(4636009)(136003)(396003)(39860400002)(346002)(376002)(186009)(451199024)(82310400011)(1800799009)(46966006)(40470700004)(36840700001)(478600001)(81166007)(6666004)(7696005)(82740400003)(86362001)(356005)(26005)(36860700001)(336012)(426003)(1076003)(2616005)(40460700003)(47076005)(83380400001)(8676002)(36756003)(5660300002)(44832011)(4326008)(8936002)(54906003)(41300700001)(316002)(6916009)(2906002)(40480700001)(70586007)(70206006)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB6287 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT006.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 98c1bc7e-49dc-4708-1314-08dbb4585602 X-Microsoft-Antispam-Message-Info: cZVYQ1jXF/be52EMdqzzm7hIes6y4nLpddVgG/Am2LBxNZICbkJfG7YwcdSXLKzGV2HiSRCFWRQlQUPAvL9D/LArp+wQjzTsAC5ryfaGIHulyDJtbwVCZgWXjX3zuZxuM9CLVIYh1r1qTY9UbhnjHCIrS2GkU7Ivuqi7iwidTffOI2SggD6iChtA6ItGrLhACYJznPnjR65QhLZkCFJBMUfwOFDnn8f7vmpO5bm9Se+HUDmCPrnCxNMmJ+tNMDDhIeFns2gqn8Tw4DEv86fLGsmZlK+XE/rB0BzCPJGkgNdGObZVXZdp1g2luKO6wAqFlPjd3lzxNj7qbenvXNtBfqpHcoj+pREEBY8RVt31kIeiKg3YGp12WyVprA9il6ISVTFqPfMce4S7+A3CczxZGGBrQDgUdjPpOYE/F6StDWlmAKE6Na5/1rlF8fyDQedVEwJOjMGH3BdvtTUhWF3uy6c95VZo/yD1pR/DEPBAnGK1JpfaLq0nsHlaK5KdTGA1KauvOGtiqEEWOnXb6vjV6PqXTh7TqihWkPmR3ZzJaqbi7BST+kiHG0qlxvXRtH66TwW15DhCnj683ZSrHZaWougnMocUu7rwlvXf4fByDoe3fKeJXvZxCXKK9KIg0UztytUMDIaiTUZ/S5xOP3kGM4kWfItCfOJFcQVJ0iQG1qfghqz+P0W35ooNRJHODB2Krt8d+KUpy9qb73Z9BlxWtx3fmE0N1v1N2jTodjuJKok3JKbIYnVkaFqccyj6SiGb X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2023 12:53:03.8999 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 13439fea-4478-4fc6-17f0-08dbb4585e88 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: DBAEUR03FT006.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB9251 Precedence: Bulk List-Subscribe: List-Help: 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 List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: ia9gngHPWpWtrNam8QyvDgfEx1787277AA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1694609593360100007 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add support to dynamically generate the CPU nodes in SSDT. Signed-off-by: Sami Mujawar --- Notes: v2: - No code change from v1 patch series. [SAMI] Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/AslT= ables/Dsdt.asl | 38 +------------------- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Conf= igurationManager.c | 8 ++++- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Conf= igurationManager.h | 2 +- 3 files changed, 9 insertions(+), 39 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/AslTables/Dsdt.asl b/Platform/ARM/VExpressPkg/ConfigurationManager/= ConfigurationManagerDxe/AslTables/Dsdt.asl index 3acc0c6bc1b48b747e011022f2300b2fe3fa994b..f60430b94c867ee9744a3355b0e= a377aff42b1c4 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-2021, ARM Ltd. All rights reserved.
+ Copyright (c) 2014-2023, ARM Ltd. All rights reserved.
Copyright (c) 2013, Al Stone All rights reserved. =20 @@ -11,42 +11,6 @@ =20 DefinitionBlock("DsdtTable.aml", "DSDT", 2, "ARMLTD", "ARM-VEXP", 1) { Scope(_SB) { - // - // Processor - // - Device(CPU0) { - Name(_HID, "ACPI0007") - Name(_UID, Zero) - } - Device(CPU1) { - Name(_HID, "ACPI0007") - Name(_UID, One) - } - Device(CPU2) { - Name(_HID, "ACPI0007") - Name(_UID, 2) - } - Device(CPU3) { - Name(_HID, "ACPI0007") - Name(_UID, 3) - } - Device(CPU4) { - Name(_HID, "ACPI0007") - Name(_UID, 4) - } - Device(CPU5) { - Name(_HID, "ACPI0007") - Name(_UID, 5) - } - Device(CPU6) { - Name(_HID, "ACPI0007") - Name(_UID, 6) - } - Device(CPU7) { - Name(_HID, "ACPI0007") - Name(_UID, 7) - } - // SMC91X Device (NET0) { Name (_HID, "LNRO0003") diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/ConfigurationManager.c b/Platform/ARM/VExpressPkg/ConfigurationMana= ger/ConfigurationManagerDxe/ConfigurationManager.c index 58a4bf9890bc2a701dab558a1987f9a51662481a..4df2d6cdae58df344804a8b4120= 8a3adb8ee0110 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.c +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.c @@ -77,7 +77,13 @@ EDKII_PLATFORM_REPOSITORY_INFO VExpressPlatRepositoryInf= o =3D { CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdDbg2), NULL }, - + // SSDT Cpu Hierarchy Table + { + EFI_ACPI_6_3_SECONDARY_SYSTEM_DESCRIPTION_TABLE_SIGNATURE, + 0, // Unused + CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdSsdtCpuTopology), + NULL + }, // Note: The last 3 tables in this list are for FVP RevC only. // IORT Table - FVP RevC { diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/ConfigurationManager.h b/Platform/ARM/VExpressPkg/ConfigurationMana= ger/ConfigurationManagerDxe/ConfigurationManager.h index aebf0a355291df5df5f588e8b7076e21eda9a152..1b52c2ebc7efb633c748f731660= 6e3dbe4e0b21c 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.h +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.h @@ -89,7 +89,7 @@ typedef EFI_STATUS (*CM_OBJECT_HANDLER_PROC) ( =20 /** The number of ACPI tables to install */ -#define PLAT_ACPI_TABLE_COUNT 9 +#define PLAT_ACPI_TABLE_COUNT 10 =20 /** The number of platform generic timer blocks */ --=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 (#108594): https://edk2.groups.io/g/devel/message/108594 Mute This Topic: https://groups.io/mt/101335886/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 Sun May 19 07:12:05 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+108597+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 1694609595032589.1524748889899; Wed, 13 Sep 2023 05:53:15 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=+7yfhfo3ZmoD/iToPXZt69w5uTZkMUXUMIaAF+kB7yo=; c=relaxed/simple; d=groups.io; h=Received-SPF:ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Received-SPF:From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:NoDisclaimer:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type; s=20140610; t=1694609594; v=1; b=qEPM+W0KVjjnTcwsxB1OLZf+m5OnRi0FkqgTcY6bXORxeviuFATrUaII7E79aveJIW6/J275 sR34JWkLE0tGfPviViW2XWtlJs/8kzj5eaSsnDYVGBXKVgp2VS2UWonypm8MFals4FtKsRNzkMd mTjCQERCP17A103RUzdnoB+Q= X-Received: by 127.0.0.2 with SMTP id 7ptdYY1788612xR5Vj1qmh0f; Wed, 13 Sep 2023 05:53:14 -0700 X-Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.55]) by mx.groups.io with SMTP id smtpd.web10.11038.1694609593529265248 for ; Wed, 13 Sep 2023 05:53:14 -0700 X-Received: from AM6P195CA0026.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:81::39) by GV2PR08MB8272.eurprd08.prod.outlook.com (2603:10a6:150:b7::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.34; Wed, 13 Sep 2023 12:53:06 +0000 X-Received: from AM7EUR03FT028.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:81:cafe::8c) by AM6P195CA0026.outlook.office365.com (2603:10a6:209:81::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19 via Frontend Transport; Wed, 13 Sep 2023 12:53:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;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+108597+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; pr=C X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM7EUR03FT028.mail.protection.outlook.com (100.127.140.192) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.20 via Frontend Transport; Wed, 13 Sep 2023 12:53:05 +0000 X-Received: ("Tessian outbound 30c9f5e988c5:v175"); Wed, 13 Sep 2023 12:53:05 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 00d31d07806c2717 X-CR-MTA-TID: 64aa7808 X-Received: from 7b9b445e9b67.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id E93B37B9-2140-4BA4-8B9C-549E84CF7B46.1; Wed, 13 Sep 2023 12:52:54 +0000 X-Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 7b9b445e9b67.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 13 Sep 2023 12:52:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gz/Wp3tpjxOaeNsaAIblGuysnumqRGKdOrKPYtUMyzPGijrn/jYFCa4lOJxxpnsYk8d0w0/bQVrPJMACLIx7qW2Y7ZpqX1PX11p09ZbLkDWuCtejgP+eZjN2goiCDK+2RlChxlTkSzXAMzX8WAjimcO5fGUgyJInxjALwlsdnrIHs9yrQ0oVadGf3n1kPHexEeNwBkWUBzZSGx2jafZWuO+bJtoFOItMb1rELZ+AfzS6Cct/1jOQy4jSbIie7K7Guw5H3UJ6L/qjiUxF97NyATQ/cpHka/2qF82CeQqHgDBWX2sHyjF+M12PiE36dIBOKsEn7CGs/V+A2GG+/9WPFA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=q6TUCAJyIGPOqAhhIZeJlN8EAVKEALTCOy1m/NSOxdo=; b=ZSKxI58aPebZOo0FY5D42kTuD+pq/nqP6urP9jWsyBJYKQx42ltzhVpC42CihJ14T7+xMDE4L0f7irXo6pxTRi+W7qvShtEs/3x6YC40Zg95nXHg+SMsUxENDhivwdVxV08qxD0y4rjJh33BD0kRtoAHpbu4Gn0Sf6XsuzmvZ/hAyxrRuT02Uq+GgG4CkMKXwkbsdEcU/6/SF63n8nmQB7VrLUS3BM0WvrYdOINKhqandkmSFOverns++va7pE2YZh6/1LsKURgjZS8fw97mtbaScOGhfyx2FWk83pSAXK9X1qT5PcYC1H8/2iWnsh6nPLlK9XGyt5dbabnJtmvvSw== 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 DUZPR01CA0112.eurprd01.prod.exchangelabs.com (2603:10a6:10:4bb::11) by DU0PR08MB8301.eurprd08.prod.outlook.com (2603:10a6:10:40f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19; Wed, 13 Sep 2023 12:52:50 +0000 X-Received: from DBAEUR03FT035.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:4bb:cafe::84) by DUZPR01CA0112.outlook.office365.com (2603:10a6:10:4bb::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19 via Frontend Transport; Wed, 13 Sep 2023 12:52:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;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; pr=C X-Received: from nebula.arm.com (40.67.248.234) by DBAEUR03FT035.mail.protection.outlook.com (100.127.142.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6792.19 via Frontend Transport; Wed, 13 Sep 2023 12:52:50 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Wed, 13 Sep 2023 12:52:49 +0000 X-Received: from E114225.Arm.com (10.1.196.36) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Wed, 13 Sep 2023 12:52:48 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , , , , Subject: [edk2-devel] [PATCH edk2-platforms v2 2/3] Platform/ARM: FVP: Specify TRBE interrupt in MADT GICC Date: Wed, 13 Sep 2023 13:52:46 +0100 Message-ID: <20230913125247.34748-3-sami.mujawar@arm.com> In-Reply-To: <20230913125247.34748-1-sami.mujawar@arm.com> References: <20230913125247.34748-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: DBAEUR03FT035:EE_|DU0PR08MB8301:EE_|AM7EUR03FT028:EE_|GV2PR08MB8272:EE_ X-MS-Office365-Filtering-Correlation-Id: 7b481df2-2f7a-413d-156c-08dbb4585f9c x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 64J34xUnlKeT+VX8vvmP3Wp2fZO+35i5HEoqMRh16Yd12Gs1N4SQAiU6Sp5mH+UmT+XqfTLMCKT6+wGuxSyhuOcjx3ZhRIy4ZWmXmADlZoCoaUBEs3uLBZF4a6JMXTcHBT5zI32oJwClakCYLfv4S/jdc3AyR7Ig3fOJPBhVAQOt/3m8XLACY6+Zojb/94gRwjd43+LdNG/qGmRl/If+VPSa9bOvwmHTcRHRhh95E/3OfbbrYiapEbGJChz/soOVYdIJ7E90unmYT09oeJShXir7ncY/AqchjCM0Z4KhingjGHIhvgSgp9dEoiMmb6xc/hzu+PwX0MABMMa+Xz6THYMAo8z8uRuw+6EM2JdKwFzueWA4SEMUS2Rj+aQuLpls2sUJW5BVcYNtljNUPe/Ov55lYkrSS9nHS28mKZJdEMy0nPrEk/rYcekoTpqmFuqGAGSfcdA5jVzgf/gktgOy55gHeO93TJ0vPJEFuNTEQIFHcbhk5J8ANNNaiSEfRpA0es6WY2Oe2LzwevuKB80PZKu+enxx3W5bN3I2onLzOhjo39eoNBCMIeKT24PX5ecjnQCAjc3VHuKAYuk9HufxB3Zwgmrkest/9Sl9Zf5Ymd5UD9abhA0NjWoYyNHSQIZLb6FRqWsmyafGlVN0ouI1X/yj+fA8q9SjgQC9i6045b2jOvw14e5hmrvGREiTpwzJ6hc4ycXNWxvYrpdWWC6FvrKi36b2Ze1FzgrLT27dk9IVH8dR39m7x4wPXfNMso1G03XR2RVu7ugXYuBsihv/VqqDgLZjMOjS9kN90y5/gDc= 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:(13230031)(4636009)(376002)(346002)(396003)(39860400002)(136003)(451199024)(1800799009)(186009)(82310400011)(40470700004)(36840700001)(46966006)(40460700003)(40480700001)(7696005)(478600001)(966005)(36860700001)(47076005)(356005)(82740400003)(81166007)(2906002)(83380400001)(336012)(426003)(26005)(2616005)(1076003)(36756003)(86362001)(70206006)(54906003)(316002)(6916009)(70586007)(41300700001)(4326008)(8936002)(44832011)(5660300002)(8676002)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB8301 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM7EUR03FT028.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: dbee06e0-7699-47c3-bd3f-08dbb458566f X-Microsoft-Antispam-Message-Info: FIvdBJoZ9mEBNN/GPq2+74btspfq7RVwf1gl10bqfdl0ZckjnX1Sg5srrHjuk06m7pVTcEu9AvPGHjEOyHmFPZflurbY8QpJKBolf/nDVzL3hgZjxsMZKwpWbsZenpc57DaW//0FdvcI4sq9Dxm63DJjndGJ1GyEz/z4o9/qL8kG7IfC+KeFDSEmahR/y/hWyjPrQx36KAfzOZl+eIi4BQriraWrLiwIvItKlDf3NXAlACYJGx5zIqUGUNSrWhqoEgZNQK12sPK9XXu/SmOT542efr/dJUT9QfJyPKvvCExzTsjgQZEQENWX3I80jW5rPp4Ep89zM/xEFD1k7p99HO8BeZiNj+is2Q88OGLUiO8vf7axG0hSqfqT1iq4QNyKvwf+DEeBJODM/fw4650mry9nz5HuUNaOVPwRmtUr6rz4COQOO81qiGsFkCtu+iZI+L7DiSWhBpomoOwY7swifuS57aeOw5EEKCZmAY/Nl28otFn7a+CK7kCe1LsCrn+YMlCjtIeb5/wEPLctfV1DaDsyieMaFprOyI4GMTudgdQu6MonnvfBZPskFZjJMoQYUIt78xm5fe7FhhQjrBC8bfg4bgMS5nSYQuwmmAK4MbMHC3sSDRs0m+NsI4ZWCgnKgnpnlOsC6IW3WmzhxpmEtaOa/oIJxq486QhL+BeCv87bGdMx8YMqOA0QPZ//1mwPOL9DN0kIRZdGPBxmEmgYmbKms8qpN2Zpe/yE37C4hE6w2skuydDsijzdQ4BNWgHG9ws47DUqJXwqM1DZA9APsw== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2023 12:53:05.6618 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7b481df2-2f7a-413d-156c-08dbb4585f9c 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: AM7EUR03FT028.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR08MB8272 Precedence: Bulk List-Subscribe: List-Help: 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 List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: lGGY5XqxXcVDcjZFsOQ1ov8Rx1787277AA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1694609595456100011 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When TRBE is enabled the FVP model uses the PPI 15 (i.e. INT ID 31) as the TRBE interrupt. Ref: https://www.kernel.org/doc/Documentation/ devicetree/bindings/arm/arm,trace-buffer-extension.yaml Therefore, check the debug feature register ID_AA64DFR0_EL1.TraceBuffer field to see if TRBE is enabled and configure the TRBE interrupt in the GICC structure in the MADT ACPI table. Note: To enable TRBE support in the FVP REvC model 1. Build TF-A with the CTX_INCLUDE_AARCH32_REGS=3D0 build flag set, otherwise this results in an exception when booting TF-A. 2. Set the model parameters to enable TRBE -C cluster0.has_trbe=3D1 -C cluster1.has_trbe=3D1 Signed-off-by: Sami Mujawar --- Notes: V2: - Incorrect comment for TRBE interrupt number [Jeshua] - Fixed comment to specify TRBE interrupt as [Sami] PPI 15 Ref: https://edk2.groups.io/g/devel/message/107426 Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Conf= igurationManager.c | 39 ++++++++++++++++---- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Conf= igurationManagerDxe.inf | 3 +- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/ConfigurationManager.c b/Platform/ARM/VExpressPkg/ConfigurationMana= ger/ConfigurationManagerDxe/ConfigurationManager.c index 4df2d6cdae58df344804a8b41208a3adb8ee0110..221ccd44ca419edf030a0b37a6b= be64a1ab11273 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 - 2021, Arm Limited. All rights reserved.
+ Copyright (c) 2017 - 2023, Arm Limited. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -37,8 +38,8 @@ EDKII_PLATFORM_REPOSITORY_INFO VExpressPlatRepositoryInfo= =3D { { // FADT Table { - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_REVISION, + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_REVISION, CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdFadt), NULL }, @@ -51,8 +52,8 @@ EDKII_PLATFORM_REPOSITORY_INFO VExpressPlatRepositoryInfo= =3D { }, // MADT Table { - EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, - EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION, + EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, + EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION, CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdMadt), NULL }, @@ -109,15 +110,15 @@ EDKII_PLATFORM_REPOSITORY_INFO VExpressPlatRepository= Info =3D { }, =20 // Boot architecture information - { EFI_ACPI_6_3_ARM_PSCI_COMPLIANT }, // BootArchFlags + { EFI_ACPI_6_5_ARM_PSCI_COMPLIANT }, // BootArchFlags =20 #ifdef HEADLESS_PLATFORM // Fixed feature flag information - { EFI_ACPI_6_3_HEADLESS }, // Fixed feature flags + { EFI_ACPI_6_5_HEADLESS }, // Fixed feature flags #endif =20 // Power management profile information - { EFI_ACPI_6_3_PM_PROFILE_ENTERPRISE_SERVER }, // PowerManagement Pro= file + { EFI_ACPI_6_5_PM_PROFILE_ENTERPRISE_SERVER }, // PowerManagement Pro= file =20 /* GIC CPU Interface information GIC_ENTRY (CPUInterfaceNumber, Mpidr, PmuIrq, VGicIrq, EnergyEfficien= cy) @@ -474,6 +475,9 @@ InitializePlatformRepository ( ) { EDKII_PLATFORM_REPOSITORY_INFO * PlatformRepo; + UINT64 DbgFeatures; + UINTN Index; + UINT16 TrbeInterrupt; =20 PlatformRepo =3D This->PlatRepoInfo; =20 @@ -491,6 +495,25 @@ InitializePlatformRepository ( PlatformRepo->GicCInfo[6].MPIDR =3D GET_MPID_MT (1, 2, 0); PlatformRepo->GicCInfo[7].MPIDR =3D GET_MPID_MT (1, 3, 0); } + + TrbeInterrupt =3D 0; + DbgFeatures =3D ArmReadIdAA64Dfr0 (); + DEBUG (( + DEBUG_INFO, + "Debug Feature Register 0 - ID_AA64DFR0_EL1 =3D 0x%lx\n", + DbgFeatures + )); + + // The ID_AA64DFR0_EL1.TraceBuffer field identifies support for FEAT_TRB= E. + if (((DbgFeatures >> 44) & 0xF) !=3D 0) { + // TRBE Interrupt is PPI 15 on FVP model. + TrbeInterrupt =3D 31; + } + + for (Index =3D 0; Index < PLAT_CPU_COUNT; Index++) { + PlatformRepo->GicCInfo[Index].TrbeInterrupt =3D TrbeInterrupt; + } + return EFI_SUCCESS; } =20 diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/VExpressPkg/Configuratio= nManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf index b53daf51d4b1afd45e41d0debb0b9f084f135f6a..dd08f8597768d4de62941c5fd74= e329c431582b0 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManagerDxe.inf +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManagerDxe.inf @@ -1,7 +1,7 @@ ## @file # Configuration Manager Dxe # -# Copyright (c) 2017 - 2021, Arm Limited. All rights reserved.
+# Copyright (c) 2017 - 2023, Arm Limited. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent ## @@ -34,6 +34,7 @@ [Packages] Platform/ARM/VExpressPkg/ArmVExpressPkg.dec =20 [LibraryClasses] + ArmLib ArmPlatformLib PrintLib UefiBootServicesTableLib --=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 (#108597): https://edk2.groups.io/g/devel/message/108597 Mute This Topic: https://groups.io/mt/101335889/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 Sun May 19 07:12:05 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+108596+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 1694609592287535.341205437444; Wed, 13 Sep 2023 05:53:12 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=uoW9IzpBBCEmRrtIcUBFVp8GPZSszbvcwh9lr2bkxFI=; c=relaxed/simple; d=groups.io; h=Received-SPF:ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:Received-SPF:From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:NoDisclaimer:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type; s=20140610; t=1694609591; v=1; b=laM2tPhUmOf6kKwqAUh/TGGdyZGvvjxNbbW5+0z5nbPksPUyvJ7d48qQ9mQFC0Zez2nTVH5j LTTK9Pyj7Lq/oaKJFVw1XYj0TQhNUu3vH5sJKmnQKlT/y5bnD4Vz1UxEHA4JFodTbKl3RXWUPSo zHilV7ksH6KGl46MMuvjn0P0= X-Received: by 127.0.0.2 with SMTP id noDyYY1788612xtIqyVSbgYB; Wed, 13 Sep 2023 05:53:11 -0700 X-Received: from EUR04-VI1-obe.outbound.protection.outlook.com (EUR04-VI1-obe.outbound.protection.outlook.com [40.107.8.72]) by mx.groups.io with SMTP id smtpd.web11.11063.1694609591007152994 for ; Wed, 13 Sep 2023 05:53:11 -0700 X-Received: from DB9PR01CA0022.eurprd01.prod.exchangelabs.com (2603:10a6:10:1d8::27) by DU0PR08MB7857.eurprd08.prod.outlook.com (2603:10a6:10:3b3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Wed, 13 Sep 2023 12:53:05 +0000 X-Received: from DBAEUR03FT012.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:1d8:cafe::c4) by DB9PR01CA0022.outlook.office365.com (2603:10a6:10:1d8::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19 via Frontend Transport; Wed, 13 Sep 2023 12:53:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;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+108596+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; pr=C X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DBAEUR03FT012.mail.protection.outlook.com (100.127.142.126) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19 via Frontend Transport; Wed, 13 Sep 2023 12:53:04 +0000 X-Received: ("Tessian outbound b5a0f4347031:v175"); Wed, 13 Sep 2023 12:53:04 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 6dc725a35ca384df X-CR-MTA-TID: 64aa7808 X-Received: from 12f536a45f02.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 43D196B5-6444-4F23-AED0-3405FE340C3F.1; Wed, 13 Sep 2023 12:52:53 +0000 X-Received: from EUR04-DB3-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 12f536a45f02.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 13 Sep 2023 12:52:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NGAWvPwlRffQwTfafnu8zspIS9/CucJNQb9CFq8+1xCCXjpJexI7LyHjOGdRouw8tJ2gXiZh4OsN6vi/x7ZzbDzXTVXkiMSy1QC14knNfvbqhEE58gr64GLYUL6y4z7a/7VxX7+9sWjcm26b5SxsBsufobsi26U+qwcwu8uVw3SqNxiM7gNgBqOINjlC4pFM+HfN8j4azncx2KcGXDVX1dEfGqFxKx2ivaVc8YjGJUu/MY83XKskwH96xXZlK0k2a3i1wceyjUQn1snK2lguLDD9EeqUuPdY6g18blNumryJo8UhTo386lsFuF6X73OoLzWm67DR3HhRg5YuiTiF8w== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Av1PDNRna+5KTztJuLfpxtQDaHGukNN8k2vHVUdssTY=; b=RNtaIM5IeVCkEG4OEd3qLyzPMDTI/70aOGJyqk6uXIlWV8dIOXgeA7LKVJs7CtRG3MGxB2V1hoKwaGH6UUVc6ZdB+6zpNe2OTbtVNFIOeUwOeLc29MDzzBYOJUjaAbsRsE0PIFjy+IlT0al8mSWGu2rqQyxQ4+IRX1pwFqx9ivdSpUS/0poDQq1/AdieKmWjU88Wzb3CgRaT75tWXTgMXdJi/VThj86ujfGG7cO7y8uyUknxJwBeTnzdsV4vRTd2Mw9xG0umKfwkyK6h9y1Oh78D1T92EZQ47vTvFv97l/wmV86Fb2x57Rzj3KGLkEveWh0dh5kMs/90LuIFWmz5Fw== 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 DUZPR01CA0101.eurprd01.prod.exchangelabs.com (2603:10a6:10:4bb::22) by DU0PR08MB7836.eurprd08.prod.outlook.com (2603:10a6:10:3b3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.36; Wed, 13 Sep 2023 12:52:50 +0000 X-Received: from DBAEUR03FT035.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:4bb:cafe::cc) by DUZPR01CA0101.outlook.office365.com (2603:10a6:10:4bb::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19 via Frontend Transport; Wed, 13 Sep 2023 12:52:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;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; pr=C X-Received: from nebula.arm.com (40.67.248.234) by DBAEUR03FT035.mail.protection.outlook.com (100.127.142.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6792.19 via Frontend Transport; Wed, 13 Sep 2023 12:52:50 +0000 X-Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Wed, 13 Sep 2023 12:52:49 +0000 X-Received: from E114225.Arm.com (10.1.196.36) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2507.27 via Frontend Transport; Wed, 13 Sep 2023 12:52:49 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , , , , Subject: [edk2-devel] [PATCH edk2-platforms v2 3/3] Platform/ARM: FVP: Add ETE device if supported by FVP Date: Wed, 13 Sep 2023 13:52:47 +0100 Message-ID: <20230913125247.34748-4-sami.mujawar@arm.com> In-Reply-To: <20230913125247.34748-1-sami.mujawar@arm.com> References: <20230913125247.34748-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: DBAEUR03FT035:EE_|DU0PR08MB7836:EE_|DBAEUR03FT012:EE_|DU0PR08MB7857:EE_ X-MS-Office365-Filtering-Correlation-Id: e19ba31e-940c-4a6c-3734-08dbb4585f27 x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: BU6xKgP9dw9gIwfrOm9QY7bClePHWhF5yfKOTDud6MrwQ5UO9NTM34KOlaIcfJ23x9a9BJNeflPOHleIFZRzWQxcfsLXE+chjf5eeocfk2C/2HZMMB1Q9NDE/2eP/HRtr6BqDz7bw6A8200+WjYFx3HTsjTAoiNRqyn6J3xlacRqWXCWF9AOjOIL9IoAw1zZlDvWZpD3mbggFw40j079PN3/1iv0lbtBDn9LvyfmGhDZS9NRQEY6xG8AHfu3iUvg3KMDqjYGMqCAbONJiT5qCrLY7MJK1kKv+ssuFgoa/fqNZBJk+h4r20IWblYFRE/+7/HVpEs/ihqRjdl0uJ18jhzbn3JxZhL7lgoyTYRYquBBvsJmL6oJJ1Kb6iRMVldGaD3SayeWXa0nbmt+vAJNcKXerwF0h7w3FWvyVHBPGsNPDbys9Fz7XKEWgf2bjDt/hLbIdPtSXLxnUhx3j83cUWElpG8KcqonimFADaPugQ8wIL043tsY9tVN//J9pPSvgoefFy9c6aOQt03Ko3ExALSbjTGmtEE8Bhsq49RnUiPUk+v1XyG4OFZWCWmjGsBUbHdRTdHhnqmXIFULwkBk4FxPL3MlfStVGKl2K5bWaXUvmsEhEhqsFW8zY+rUsIi7mCICecjMASlx/5OamD1e0J1MoztIw5mmyeBTKJVaZLuDw+FpObkWgCBLeqcMiLdJuAYKwxjB9QjSkfylX+5E63nVeWyhOT1ZKK66CNY2qt4PlfL1Gd9+8OH8CgO8gi0G 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:(13230031)(4636009)(376002)(136003)(346002)(39860400002)(396003)(1800799009)(82310400011)(186009)(451199024)(36840700001)(46966006)(356005)(82740400003)(81166007)(86362001)(36756003)(40480700001)(6916009)(2906002)(54906003)(5660300002)(8936002)(7696005)(4326008)(44832011)(8676002)(336012)(316002)(41300700001)(70586007)(70206006)(47076005)(478600001)(36860700001)(426003)(1076003)(26005)(2616005)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB7836 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT012.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 6f321e9c-358d-4541-cbb8-08dbb45856c0 X-Microsoft-Antispam-Message-Info: gw/Dkj9bKclkx1enwfkVj2qTJcbCkoB8XKo/s01ucKbrcGfKdXGIwbc/D3FRMJ2mj+QFf5q1Ps8lMtxr6O7Zf/wQAGtwdXaAAmDoMVH31z+uodJ8AMOHHJglVW05nBY+mbWlPstcgSuIsJpsEGPLbTIZ6HaaeEjA9rU+Dw7oapraUzkbdVIS7Jz73NvlWZBsP9utfU3OLhF8IaxxIBQCOa4hARBzYwVPS7fHDKaYRtFZlsyRHwVLljnm20Hh1/qBahtN22vwlcB4L2oMVfIr5SmJKQyhpYlh2fD8eVfSPFRaaX61RCRCDjMsY2NBWZ/vpKreix1nGAw97KpPcxUhKyAedK9YZx5n5S3HBTkbQ8v4JYcHVB0rgKHCkTgqC82wFS5P43Yp4HWDLBFRxtgRHQj+zMGO5Awjw5r71PgZr/gLU/buDfseuv18/9GTThoqHYrTBjQrZcl97r7gh6NfaeYKNsbYvtcrKGBSQUPDuQV/wm47ItSr7i0uDpPIsxsoZ5zGfIfG+e9LHL44FyZhghNE4vh+ZvtaAxmOcR14gJ+S5Ee998Wa1LXL67Jmi59DIMKtkleqdtdZQW00v1Bv9ZzKdWRQiG+NUP+MifhWAwta92oD0H2xf1bOnktkGqlh6DRIsxPHydqz15XhuE4A/iMbCPyLXL3YgXdl4g8x/FEeps9f/D/57d9W6yMyS1P+/+xtIaw9Se1e3wOo6rAzWUFeFEocUKVWuX7V0NIDMEmELBvd0em7ET7BjyZgHU2w X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2023 12:53:04.9428 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e19ba31e-940c-4a6c-3734-08dbb4585f27 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: DBAEUR03FT012.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB7857 Precedence: Bulk List-Subscribe: List-Help: 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 List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 7CS2fnvuUBU9ACa1k5OyfM9Wx1787277AA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1694609593318100005 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When ETE is enabled in the FVP model the firmware can check the debug feature register ID_AA64DFR0_EL1.TraceVer field to identify the presence of FEAT_ETE and add an ETE device to the CPU node in the AML CPU hierarchy. This enables the Operating System driver to probe and enable ETE support. Note: To enable ETE support in the FVP REvC model 1. Build TF-A with the CTX_INCLUDE_AARCH32_REGS=3D0 build flag set, otherwise this results in an exception when booting TF-A 2. Set the model parameters to enable TRBE as this is required for ETE -C cluster0.has_trbe=3D1 -C cluster1.has_trbe=3D1 3. Set the ETE plugin for the model --plugin \libete-plugin.[so|dll] Signed-off-by: Sami Mujawar --- Notes: v2: - No code change from v1 patch series. [SAMI] Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Conf= igurationManager.c | 25 ++++++++++++++++++++ Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Conf= igurationManager.h | 2 ++ 2 files changed, 27 insertions(+) diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/ConfigurationManager.c b/Platform/ARM/VExpressPkg/ConfigurationMana= ger/ConfigurationManagerDxe/ConfigurationManager.c index 221ccd44ca419edf030a0b37a6bbe64a1ab11273..b4855c6b6fdca0093744cad65cf= abbb785a6c62c 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.c +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.c @@ -366,6 +366,11 @@ EDKII_PLATFORM_REPOSITORY_INFO VExpressPlatRepositoryI= nfo =3D { FixedPcdGet32 (PcdPciBusMin), FixedPcdGet32 (PcdPciBusMax) }, + + // Embedded Trace device info + { + ArmEtTypeEte + } }; =20 /** A helper function for returning the Configuration Manager Objects. @@ -478,6 +483,7 @@ InitializePlatformRepository ( UINT64 DbgFeatures; UINTN Index; UINT16 TrbeInterrupt; + CM_OBJECT_TOKEN EtToken; =20 PlatformRepo =3D This->PlatRepoInfo; =20 @@ -497,6 +503,7 @@ InitializePlatformRepository ( } =20 TrbeInterrupt =3D 0; + EtToken =3D CM_NULL_TOKEN; DbgFeatures =3D ArmReadIdAA64Dfr0 (); DEBUG (( DEBUG_INFO, @@ -510,8 +517,14 @@ InitializePlatformRepository ( TrbeInterrupt =3D 31; } =20 + // The ID_AA64DFR0_EL1.TraceVer field identifies the presence of FEAT_ET= E. + if (((DbgFeatures >> 4) & 0xF) !=3D 0) { + EtToken =3D (CM_OBJECT_TOKEN)&PlatformRepo->EtInfo; + } + for (Index =3D 0; Index < PLAT_CPU_COUNT; Index++) { PlatformRepo->GicCInfo[Index].TrbeInterrupt =3D TrbeInterrupt; + PlatformRepo->GicCInfo[Index].EtToken =3D EtToken; } =20 return EFI_SUCCESS; @@ -983,6 +996,18 @@ GetArmNameSpaceObject ( ); break; =20 + case EArmObjEtInfo: + if (Token =3D=3D (CM_OBJECT_TOKEN)&PlatformRepo->EtInfo) { + Status =3D HandleCmObject ( + CmObjectId, + &PlatformRepo->EtInfo, + sizeof (PlatformRepo->EtInfo), + 1, + CmObject + ); + } + break; + default: { Status =3D EFI_NOT_FOUND; DEBUG (( diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/ConfigurationManager.h b/Platform/ARM/VExpressPkg/ConfigurationMana= ger/ConfigurationManagerDxe/ConfigurationManager.h index 1b52c2ebc7efb633c748f7316606e3dbe4e0b21c..be2b512911f897dc57328673ae4= f4a2014ec20fb 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.h +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.h @@ -171,6 +171,8 @@ typedef struct PlatformRepositoryInfo { /// PCI configuration space information CM_ARM_PCI_CONFIG_SPACE_INFO PciConfigInfo; =20 + CM_ARM_ET_INFO EtInfo; + /// System ID UINT32 SysId; } EDKII_PLATFORM_REPOSITORY_INFO; --=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 (#108596): https://edk2.groups.io/g/devel/message/108596 Mute This Topic: https://groups.io/mt/101335888/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-