From nobody Fri May 3 22:11:27 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+79363+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 1629125563376702.6539479912844; Mon, 16 Aug 2021 07:52:43 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 1K8nYY1788612xdXIw9AnTQT; Mon, 16 Aug 2021 07:52:43 -0700 X-Received: from EUR02-VE1-obe.outbound.protection.outlook.com (EUR02-VE1-obe.outbound.protection.outlook.com [40.107.2.42]) by mx.groups.io with SMTP id smtpd.web12.25311.1629125561607823631 for ; Mon, 16 Aug 2021 07:52:42 -0700 X-Received: from AM6PR0202CA0045.eurprd02.prod.outlook.com (2603:10a6:20b:3a::22) by AM7PR08MB5447.eurprd08.prod.outlook.com (2603:10a6:20b:10b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17; Mon, 16 Aug 2021 14:52:34 +0000 X-Received: from AM5EUR03FT022.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:3a:cafe::8b) by AM6PR0202CA0045.outlook.office365.com (2603:10a6:20b:3a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13 via Frontend Transport; Mon, 16 Aug 2021 14:52:34 +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+79363+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 AM5EUR03FT022.mail.protection.outlook.com (10.152.16.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16 via Frontend Transport; Mon, 16 Aug 2021 14:52:33 +0000 X-Received: ("Tessian outbound 32695b2df2f8:v103"); Mon, 16 Aug 2021 14:52:32 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: cc65eb5753d327bb X-CR-MTA-TID: 64aa7808 X-Received: from 3a802afde294.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 822CAE1A-9BD6-473A-B39D-E7A6CF21F526.1; Mon, 16 Aug 2021 14:52:25 +0000 X-Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 3a802afde294.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 16 Aug 2021 14:52:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sd5ezBXMwd4wPgeEIB4jDyHfDznQDlire/HJMIdM4FoNi+g0z6+AIPCYCoMxq1HY/VoJj7LopJutiA7ToU9Z125QneGvp+tnbC5gQPFpL7DgW262x8OQ0j8kMxjdX6dwjnQ5qQCpz72EFNNi/ANPoFgE5y83Ava6qQorNb48Lt3UzenwdD710W5rlwIYiS+lIl5kQBTnzDpHdiXUNWKoZjk+OSZ35i2q/6tdMQMqeM6FLpb3GEAXBNkT6wmAezuInW22wv3wWrpCi192/moVi7AWM6lFRRMxYDn2jHv1erzMsaRHXAtXBoAnrHiyaQA2KU6MYP7oHqQUybHHUdWmFQ== 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=JAqD+MqqKZFel/9EIfjxF6aVj0c8yZvIW9dQZkTeshw=; b=E3Cy/x4hda18DfwBwmn4Usx4xOJcRWpw7tmkl4pqXJzwG4TcMRhHRFEAPKiihr/wJaqo5Xt++AuQmltjMrpwZC5zV0eoX6jvqn/oksfVz5/3+86WyTLzZboqWvOeJGw0+cyeKIpfc1bMXdJ1iKWSQUfs/SeqHkcIqFP7fFu2z76PP4D8Vrp2BEOGMp1tpEkaV6VpMbGcEns6pCcFPsPeZaDtqAEWSeNSXNoXeTXFZ8kcYtfDC3xF1n7hYNvCstvWWviF/dQLlZ6e5ScJwWJwPy1cJatjUZ+D4eYkXStPQ0o1nj+fOOEeEPi+BRSiacAsR+GwPS3VT+r21entbzq+dA== 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 AM0PR08CA0012.eurprd08.prod.outlook.com (2603:10a6:208:d2::25) by DB7PR08MB3642.eurprd08.prod.outlook.com (2603:10a6:10:4a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.15; Mon, 16 Aug 2021 14:52:23 +0000 X-Received: from VE1EUR03FT029.eop-EUR03.prod.protection.outlook.com (2603:10a6:208:d2:cafe::d0) by AM0PR08CA0012.outlook.office365.com (2603:10a6:208:d2::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Mon, 16 Aug 2021 14:52:23 +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 VE1EUR03FT029.mail.protection.outlook.com (10.152.18.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4415.16 via Frontend Transport; Mon, 16 Aug 2021 14:52:23 +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.2308.14; Mon, 16 Aug 2021 14:52:19 +0000 X-Received: from e125153.arm.com (10.57.66.54) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Mon, 16 Aug 2021 14:52:18 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v1 1/2] DynamicTablesPkg: Rename SBSA generic watchdog Date: Mon, 16 Aug 2021 15:52:17 +0100 Message-ID: <20210816145218.14140-2-christopher.jones@arm.com> In-Reply-To: <20210816145218.14140-1-christopher.jones@arm.com> References: <20210816145218.14140-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8e2c0a8e-f4e3-4e8c-0980-08d960c57ad6 X-MS-TrafficTypeDiagnostic: DB7PR08MB3642:|AM7PR08MB5447: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:9508;OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: XOX67WVFkNGJzj25qbspg9BpzTQja0qX6m+R8HyFTeObD3nnRFyLYo90Yms+omlE6Uirzlld9APVuRZdIkiXyUdJ4KwYHOih5M91CDkRdZvEv6YM/uMQ73o0112nYLL9vfkltFhHZIFM4r/4KaOMbqW0h5vMX7Ub8aVB+EnOqFJthmgrkskfb39bBcO0dDO5tXDUXpMpkKeqQ7RXZVMYhAbKk9LTCReq2nWiQP9rkspChEIP9AiGLluL4xCrAWTu7wmLm9Po1bqpoQOF6E9NS/Dfs+AEe8U7bcoRwI7BMCxEufNbg0xCTcgUcZNHBY6uIrc9U+tRTVDsln0orOSA5TVfx39c3JmO9MaC6ySnJniQ1UznIbg0/jPQ0fA2hSx/PbrIUA8kWL+/HzhF9zMiBHhmytwC9mpCgqUS9hCt+g4kL68RvYXQmmSZ24Fq+utCeqGFtSq3LLYtXvqX71r3ghdgmbfVYSYp63WQEZzsrubCjcKAHM4jtJ2kHaE9yO27/Nuy1csvEd52sl3WMgKulgD5vMoCzuus/9MLycPuuso/W39obto8Zd69EDsd15ddERJ7GDcTIZqjt9/C+lsw8vjTcyTfwo6xNaAPWPzrCD/AfmmT7nbKvlVXny4cabINoW62Dh6EMMBsakl0UBg/t8r5YGNMO3ZWzLuEWov9CMxYtB4rMhKQrFXVQEttzp+wtvSDnCSIp0Xy7I2KyXUysEQIQhl6yFeRXj33yv7tIdif1P5/DZLSOP6WgA8drhJG9IdMqioUkAvZ9yzZKWa2AVCEBFqovoe+AwzRNS50u6DMTQ/Ge8pUuwblfvv5P5MccprusEMLxDLw89heFQUVEc8ZxPDtY43jTnxZQv+BSapAKxaVAtlFkeh5OO2sQVxc 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)(136003)(39860400002)(346002)(36840700001)(46966006)(336012)(36756003)(54906003)(426003)(26005)(8676002)(1076003)(478600001)(186003)(8936002)(316002)(2616005)(47076005)(82740400003)(81166007)(82310400003)(70586007)(7696005)(356005)(34020700004)(4326008)(36860700001)(83380400001)(5660300002)(2906002)(86362001)(6916009)(70206006)(41533002)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR08MB3642 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT022.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: ffe6adea-b74e-4159-6a21-08d960c574b2 X-Microsoft-Antispam-Message-Info: 0Nzvi3Iv7Y6WuEMB9RnwhMTuMbSqS1B4LPe2L2HVGv/30mFaYpDHC9YG0ggvV/v5uPThN483VlpBgT6iRMLAM6a33MoHwy80xefcriFqwYZoSsh2SBSF89o4p+EVtAhNNuG2uqsuBgyDzZD+Sk5V4FxdWxkq91+dGAHAzqPZlqvdULtt5j7BuMwE0BkX4Zwrp4Huwczp2Rm+oVRaDgXby+TmNLs+pD1ZJkC5zcpFS3VaJArIrIQdDTaKQklD9uvLdJ12bNPcxPVXSXshYmPFWKW2xWJkVZ+4vz6eqNVAQzKZRujCS9YIdtCkh0X6R0DmNBElwbDBtWeQJVh3qioVsKnRKocIO0EmeyffHpnt0mJoAmN7Ydo7+TaGQEBGlJv1SKNHvSjOi65Y9V8tAZbYcN+Cb3xHxHyLHx/Hb609OAGUco63dtw7stHSlQsVXAr3eejbAlHr2Ym1LCX/O9/bfXhKWNREOuydy7GHgE6/0fAWKfgtOCYvyscKje909CBsvyl90D1y05ZccV9chxgaNKkVH503/M041N+YiZVxYrho+qz4OgOqg4r6BuiSQ7KrjHypb9e+Dok6gS7tGfBoleOmIfnt9hW5S5K3/8TRE8i7XzZYRnNA+ENNxb/A0H1TGfI76MMUv++/dKSoEmkbQ8suTDOEncltfx/hwYDFHStPGQvkrIDecq0Qvo2+No/aBNaDAqAsnOOoccBn09eLXzdXj0+fO5DCI5h347FRTxrQpoP1UgTCEmmR9/9r49hbcqKJczfczf9K0grQohOX8TLE+RDW047YGzZsWBefzRaG6fbX+gs3cYhUJVrG08a2 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2021 14:52:33.4448 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8e2c0a8e-f4e3-4e8c-0980-08d960c57ad6 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: AM5EUR03FT022.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5447 Precedence: Bulk List-Unsubscribe: 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,christopher.jones@arm.com X-Gm-Message-State: paUd1LNMNyuRlPxNngRlfRf5x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1629125563; bh=eAEZ8YxWJhdIcZRD69hgY3+HpAjfAOVTg3axLSbDR1A=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=dZfD7IgINhc8ky7ZAT/S+5m27qvaOAZxQ49tvJcHSgrs9i1qCFEozyEU5Eh8V12rnQe 4nFIlmvffnN7Txb/Ys4V33XBtwxtEiRJenpnExaYt9BV0sYwBkVJTNDmHnzyzbdceurWO P6im/PChOdHN8HQyvIoVwFmFauFkaaSaAWU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629125565498100002 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Buzilla: 3565 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3565) As part of the updates to ACPI 6.4 the "SBSA Generic Watchdog" was renamed to the "Arm Generic Watchdog". This patch implements that change by updating the GTDT generator to use Acpi64.h and renames any occurence of "SBSA Generic Watchdog" to "Arm Generic Watchdog". Signed-off-by: Chris Jones Reviewed-by: Sami Mujawar Reviewed-by: Zhichao Gao --- DynamicTablesPkg/Include/ArmNameSpaceObjects.h | 8 +-- DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c | 60 ++++= ++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTables= Pkg/Include/ArmNameSpaceObjects.h index 19dcae13b2191e5f0b03ea85edec1191d2a406bf..2244eafaf00939ba36a3fdf0215= 15fcb1e152764 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -395,21 +395,21 @@ typedef struct CmArmGTBlockInfo { } CM_ARM_GTBLOCK_INFO; =20 /** A structure that describes the - SBSA Generic Watchdog information for the Platform. + Arm Generic Watchdog information for the Platform. =20 ID: EArmObjPlatformGenericWatchdogInfo */ typedef struct CmArmGenericWatchdogInfo { - /// The physical base address of the SBSA Watchdog control frame + /// The physical base address of the Arm Watchdog control frame UINT64 ControlFrameAddress; =20 - /// The physical base address of the SBSA Watchdog refresh frame + /// The physical base address of the Arm Watchdog refresh frame UINT64 RefreshFrameAddress; =20 /// The watchdog interrupt UINT32 TimerGSIV; =20 - /** The flags for the watchdog as described by the SBSA watchdog + /** The flags for the watchdog as described by the Arm watchdog structure in the ACPI specification. */ UINT32 Flags; diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator= .c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c index c109f2ac207311646e5a4ad3aa465b1c2883e465..06a23876aea8e55d6e4c8be4471= ff5aca2514f66 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiGtdtLibArm/GtdtGenerator.c @@ -1,11 +1,11 @@ /** @file GTDT Table Generator =20 - Copyright (c) 2017 - 2019, ARM Limited. All rights reserved. + Copyright (c) 2017 - 2021, ARM Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent =20 @par Reference(s): - - ACPI 6.3 Specification - January 2019 + - ACPI 6.4 Specification - January 2021 =20 **/ =20 @@ -41,7 +41,7 @@ GET_OBJECT_LIST ( CM_ARM_GENERIC_TIMER_INFO ); =20 -/** This macro expands to a function that retrieves the SBSA Generic +/** This macro expands to a function that retrieves the Arm Generic Watchdog Timer Information from the Configuration Manager. */ GET_OBJECT_LIST ( @@ -91,7 +91,7 @@ EFI_STATUS EFIAPI AddGenericTimerInfo ( IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrPro= tocol, - IN EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE * CONST Gtdt, + IN EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE * CONST Gtdt, IN CONST UINT32 PlatformT= imerCount, IN CONST UINT32 AcpiTable= Revision ) @@ -133,7 +133,7 @@ AddGenericTimerInfo ( GenericTimerInfo->CounterReadBaseAddress; Gtdt->PlatformTimerCount =3D PlatformTimerCount; Gtdt->PlatformTimerOffset =3D (PlatformTimerCount =3D=3D 0) ? 0 : - sizeof (EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE); + sizeof (EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE); =20 if (AcpiTableRevision > EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE_REV= ISION) { Gtdt->VirtualPL2TimerGSIV =3D GenericTimerInfo->VirtualPL2TimerGSIV; @@ -143,7 +143,7 @@ AddGenericTimerInfo ( return Status; } =20 -/** Add the SBSA Generic Watchdog Timers to the GTDT table. +/** Add the Arm Generic Watchdog Timers to the GTDT table. =20 @param [in] Gtdt Pointer to the GTDT Table. @param [in] WatchdogOffset Offset to the watchdog information in the @@ -154,26 +154,26 @@ AddGenericTimerInfo ( STATIC VOID AddGenericWatchdogList ( - IN EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE * CONST Gtdt, + IN EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE * CONST Gtdt, IN CONST UINT32 WatchdogOffset, IN CONST CM_ARM_GENERIC_WATCHDOG_INFO * WatchdogInfoLis= t, IN UINT32 WatchdogCount ) { - EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE * Watchdog; + EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG_STRUCTURE * Watchdog; =20 ASSERT (Gtdt !=3D NULL); ASSERT (WatchdogInfoList !=3D NULL); =20 - Watchdog =3D (EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE *) + Watchdog =3D (EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG_STRUCTURE *) ((UINT8*)Gtdt + WatchdogOffset); =20 while (WatchdogCount-- !=3D 0) { // Add watchdog entry DEBUG ((DEBUG_INFO, "GTDT: Watchdog =3D 0x%p\n", Watchdog)); - Watchdog->Type =3D EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG; + Watchdog->Type =3D EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG; Watchdog->Length =3D - sizeof (EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE); + sizeof (EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG_STRUCTURE); Watchdog->Reserved =3D EFI_ACPI_RESERVED_BYTE; Watchdog->RefreshFramePhysicalAddress =3D WatchdogInfoList->RefreshFrameAddress; @@ -249,7 +249,7 @@ IsGtFrameNumberEqual ( STATIC EFI_STATUS AddGTBlockTimerFrames ( - IN EFI_ACPI_6_3_GTDT_GT_BLOCK_TIMER_STRUCTURE * GtBlockFrame, + IN EFI_ACPI_6_4_GTDT_GT_BLOCK_TIMER_STRUCTURE * GtBlockFrame, IN CONST CM_ARM_GTBLOCK_TIMER_FRAME_INFO * GTBlockTimer= FrameList, IN UINT32 GTBlockFrame= Count ) @@ -329,15 +329,15 @@ STATIC EFI_STATUS AddGTBlockList ( IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtoco= l, - IN EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE * CONST Gtdt, + IN EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE * CONST Gtdt, IN CONST UINT32 GTBlockOffset, IN CONST CM_ARM_GTBLOCK_INFO * GTBlockInfo, IN UINT32 BlockTimerCou= nt ) { EFI_STATUS Status; - EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE * GTBlock; - EFI_ACPI_6_3_GTDT_GT_BLOCK_TIMER_STRUCTURE * GtBlockFrame; + EFI_ACPI_6_4_GTDT_GT_BLOCK_STRUCTURE * GTBlock; + EFI_ACPI_6_4_GTDT_GT_BLOCK_TIMER_STRUCTURE * GtBlockFrame; CM_ARM_GTBLOCK_TIMER_FRAME_INFO * GTBlockTimerFrameList; UINT32 GTBlockTimerFrameCount; UINTN Length; @@ -345,7 +345,7 @@ AddGTBlockList ( ASSERT (Gtdt !=3D NULL); ASSERT (GTBlockInfo !=3D NULL); =20 - GTBlock =3D (EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE *)((UINT8*)Gtdt + + GTBlock =3D (EFI_ACPI_6_4_GTDT_GT_BLOCK_STRUCTURE *)((UINT8*)Gtdt + GTBlockOffset); =20 while (BlockTimerCount-- !=3D 0) { @@ -367,8 +367,8 @@ AddGTBlockList ( return Status; } =20 - Length =3D sizeof (EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE) + - (sizeof (EFI_ACPI_6_3_GTDT_GT_BLOCK_TIMER_STRUCTURE) * + Length =3D sizeof (EFI_ACPI_6_4_GTDT_GT_BLOCK_STRUCTURE) + + (sizeof (EFI_ACPI_6_4_GTDT_GT_BLOCK_TIMER_STRUCTURE) * GTBlockInfo->GTBlockTimerFrameCount); =20 // Check that the length of the GT block does not @@ -386,15 +386,15 @@ AddGTBlockList ( return Status; } =20 - GTBlock->Type =3D EFI_ACPI_6_3_GTDT_GT_BLOCK; + GTBlock->Type =3D EFI_ACPI_6_4_GTDT_GT_BLOCK; GTBlock->Length =3D (UINT16)Length; GTBlock->Reserved =3D EFI_ACPI_RESERVED_BYTE; GTBlock->CntCtlBase =3D GTBlockInfo->GTBlockPhysicalAddress; GTBlock->GTBlockTimerCount =3D GTBlockInfo->GTBlockTimerFrameCount; GTBlock->GTBlockTimerOffset =3D - sizeof (EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE); + sizeof (EFI_ACPI_6_4_GTDT_GT_BLOCK_STRUCTURE); =20 - GtBlockFrame =3D (EFI_ACPI_6_3_GTDT_GT_BLOCK_TIMER_STRUCTURE*) + GtBlockFrame =3D (EFI_ACPI_6_4_GTDT_GT_BLOCK_TIMER_STRUCTURE*) ((UINT8*)GTBlock + GTBlock->GTBlockTimerOffset); =20 // Add GT Block Timer frames @@ -413,7 +413,7 @@ AddGTBlockList ( } =20 // Next GTBlock - GTBlock =3D (EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE *)((UINT8*)GTBlock + + GTBlock =3D (EFI_ACPI_6_4_GTDT_GT_BLOCK_STRUCTURE *)((UINT8*)GTBlock + GTBlock->Length); GTBlockInfo++; }// for @@ -460,7 +460,7 @@ BuildGtdtTable ( UINT32 BlockTimerCount; CM_ARM_GENERIC_WATCHDOG_INFO * WatchdogInfoList; CM_ARM_GTBLOCK_INFO * GTBlockInfo; - EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE * Gtdt; + EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE * Gtdt; UINT32 Idx; UINT32 GTBlockOffset; UINT32 WatchdogOffset; @@ -527,11 +527,11 @@ BuildGtdtTable ( =20 // Calculate the GTDT Table Size PlatformTimerCount =3D 0; - TableSize =3D sizeof (EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE); + TableSize =3D sizeof (EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE); if (BlockTimerCount !=3D 0) { GTBlockOffset =3D TableSize; PlatformTimerCount +=3D BlockTimerCount; - TableSize +=3D (sizeof (EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE) * + TableSize +=3D (sizeof (EFI_ACPI_6_4_GTDT_GT_BLOCK_STRUCTURE) * BlockTimerCount); =20 for (Idx =3D 0; Idx < BlockTimerCount; Idx++) { @@ -546,7 +546,7 @@ BuildGtdtTable ( )); goto error_handler; } - TableSize +=3D (sizeof (EFI_ACPI_6_3_GTDT_GT_BLOCK_TIMER_STRUCTURE) * + TableSize +=3D (sizeof (EFI_ACPI_6_4_GTDT_GT_BLOCK_TIMER_STRUCTURE) * GTBlockInfo[Idx].GTBlockTimerFrameCount); } =20 @@ -562,7 +562,7 @@ BuildGtdtTable ( if (WatchdogCount !=3D 0) { WatchdogOffset =3D TableSize; PlatformTimerCount +=3D WatchdogCount; - TableSize +=3D (sizeof (EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_STRUCT= URE) * + TableSize +=3D (sizeof (EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG_STRUCTU= RE) * WatchdogCount); DEBUG (( DEBUG_INFO, @@ -585,7 +585,7 @@ BuildGtdtTable ( goto error_handler; } =20 - Gtdt =3D (EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE*)*Table; + Gtdt =3D (EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE*)*Table; DEBUG (( DEBUG_INFO, "GTDT: Gtdt =3D 0x%p TableSize =3D 0x%x\n", @@ -712,9 +712,9 @@ ACPI_TABLE_GENERATOR GtdtGenerator =3D { // Generator Description L"ACPI.STD.GTDT.GENERATOR", // ACPI Table Signature - EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, + EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, // ACPI Table Revision supported by this Generator - EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION, + EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION, // Minimum ACPI Table Revision supported by this Generator EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION, // Creator ID --=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 (#79363): https://edk2.groups.io/g/devel/message/79363 Mute This Topic: https://groups.io/mt/84925101/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 Fri May 3 22:11:27 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+79364+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 1629125570183696.0200764321345; Mon, 16 Aug 2021 07:52:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 5UmjYY1788612xhkOZIQHCxu; Mon, 16 Aug 2021 07:52:49 -0700 X-Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.64]) by mx.groups.io with SMTP id smtpd.web10.25293.1629125568762460245 for ; Mon, 16 Aug 2021 07:52:49 -0700 X-Received: from AM8P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:219::21) by DB8PR08MB5146.eurprd08.prod.outlook.com (2603:10a6:10:e7::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.19; Mon, 16 Aug 2021 14:52:41 +0000 X-Received: from VE1EUR03FT026.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:219:cafe::68) by AM8P190CA0016.outlook.office365.com (2603:10a6:20b:219::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17 via Frontend Transport; Mon, 16 Aug 2021 14:52:41 +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+79364+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 VE1EUR03FT026.mail.protection.outlook.com (10.152.18.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16 via Frontend Transport; Mon, 16 Aug 2021 14:52:40 +0000 X-Received: ("Tessian outbound f11f34576ce3:v103"); Mon, 16 Aug 2021 14:52:40 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 54e53933eee08dbc X-CR-MTA-TID: 64aa7808 X-Received: from a37d14c4bbe4.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 4C009A47-A6B6-4D6C-973E-4F54DEC138C8.1; Mon, 16 Aug 2021 14:52:34 +0000 X-Received: from EUR03-AM5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id a37d14c4bbe4.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 16 Aug 2021 14:52:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XbLsbFM11Jc2wWY1iwXamEhzf1in5lOoARGrURIUVQrAB1ZkAoP8UPog2Wi2qA5//+5JhPrYGNgD1PtkmluFeJC/k6iqqNUqIvt4qX95BUiFz364AQtLHOJuOLAlzPBlprzarl/DnQxxXYhuvbxs34VZqj/Iu3HPqO0pv+LqZ10A+1EJliCeQSAV3H4Jzejw9JJ4gYqePlx855gxdSq9s5NboOKC+Z+N+3rKrR/iQAkFmO6kRdVW6QtD5vnD5wF/6Hi9+P3/Sg3jla8dNiBDLBE7nfYzBQNz1OtZCOtCLPVpGamHGXN8ct4zPDnOnk84s6Co9a9R9hsbme/X1GvlsA== 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=+RkaEz1dpfWzJ4vEjNbnwyxAS5mFubfVIxFck0EDFxw=; b=LfxvRouGzRlSdI2X5n/hNjRjCtyGBFq/8qd2Ua4/36G2KGhfKvrCoUa69ZoI0LYSH2OOc6SLpb7vNVUgkeJqQoShTRScH/WFEFoT1Uv2OeMkmOh0uTiTd7vUYak1YkvX0iWRsWyYwCjoYIEsOAq9cacJiMeo/+JR4u7/e0ZwDoSyz/jfjAq+ZEurFVJeoYhxQrp1fYBkDFPYuFkNDS3EmwvNnySzCWFwVqB3tJTgKQmGQOqeN7R95y1Br45c7uPyQd3e0KUIVbowOnxdmkP91XMugfbdlw9uMuLZW/S0AWd55eGWNNaFQx6w+TgihuJaGsla1M5OYU1CC0ErHerKdw== 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 PR0P264CA0229.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::25) by AM7PR08MB5527.eurprd08.prod.outlook.com (2603:10a6:20b:de::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.15; Mon, 16 Aug 2021 14:52:32 +0000 X-Received: from VE1EUR03FT012.eop-EUR03.prod.protection.outlook.com (2603:10a6:100:1e:cafe::90) by PR0P264CA0229.outlook.office365.com (2603:10a6:100:1e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.15 via Frontend Transport; Mon, 16 Aug 2021 14:52:32 +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 VE1EUR03FT012.mail.protection.outlook.com (10.152.18.211) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4415.14 via Frontend Transport; Mon, 16 Aug 2021 14:52:32 +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.2308.14; Mon, 16 Aug 2021 14:52:19 +0000 X-Received: from e125153.arm.com (10.57.66.54) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Mon, 16 Aug 2021 14:52:19 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v1 2/2] ShellPkg: Update Acpiview GTDT parser to ACPI 6.4 Date: Mon, 16 Aug 2021 15:52:18 +0100 Message-ID: <20210816145218.14140-3-christopher.jones@arm.com> In-Reply-To: <20210816145218.14140-1-christopher.jones@arm.com> References: <20210816145218.14140-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cd120555-0875-45f6-07ac-08d960c57f38 X-MS-TrafficTypeDiagnostic: AM7PR08MB5527:|DB8PR08MB5146: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:2089;OLM:2089; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: YLZC3MSQxKEqnUwG3SsRECxV4EpKWMwHixsX3f21EYplK0v26fsEuZhznPchv/RGsJZwbvVHw01p5qV0qAgrNcPvCjHBfoTAdueSo3QhcsX7F6+0D8pQsAuS7ZQIIOrCJGyt+mwnOWq9sYuUTTRbxUvXPv/OmztOy8SkeWlhxfvHvhNq/k8GNIiOz756uz7xOPPLxqrLE7oNLQlz5fNQ7drDV/bwjPVRO9qkASAbj53QOXarWV7zsM5L14fuAFzoOKBG1iW6kDJqxXuI2XlZnBz0Z5I2ZKGHz5PetQqtr9Htfyq079750NF7f5sGWoO4YNQNYmOqo9XCiI/hv2J52nj9WbTXqYHUBvVwoNe5YUQgMVgf3KLykGapZek4qajFgRDVj3B5g2fjIPqpdhsGqXlF/NNDP0LtG1uwQwyj1Iqte7IKbfLHWtuefnw7j0pNdlPs/kE5QB0IKThkgVo4vDnZvMl1CcvfvweQRMXQinRbsHj/P624EN1T9g317utvE9USZ4TXjjnOiZ8A0XUdiQ2oBcCg3kvv3Pz73h/0dLiT5Q2HLyLemTOIiypER/PkfdtKGTLyJV2GVyC2QDwiGbEzaEfAyihqibsfQItfnOYdWfhbF66Hv+R3L5b13T4jXtBzA7XJHxcHoZh+NpGa6yhxpV0X4Vgvo/PPPgYDPVWedP1VHTrjT0f9zolzCbFoVlxSDT7FQJL/DgcV4xm4NmHRQkHc6GYDjkbZMWdJpKOASUpwvNnUWc2x5w8Eng2wMboae7lag9gik2rZp4ZQ/rrE04Vs0h04TSWhHP3Y+ZV6ziCoP8AQy7lXd7R1DMmAnLPgFprGyZtjtsVYr1/pT1KGDvdquVrl+yX8wY9oNWI= 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)(46966006)(36840700001)(186003)(2906002)(47076005)(86362001)(82310400003)(4326008)(34020700004)(70206006)(508600001)(8676002)(426003)(70586007)(15650500001)(36860700001)(5660300002)(2616005)(54906003)(356005)(81166007)(336012)(36756003)(6916009)(7696005)(316002)(26005)(83380400001)(8936002)(1076003)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5527 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT026.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 65efa9a7-4f3a-4eb7-df9b-08d960c57a17 X-Microsoft-Antispam-Message-Info: fSQFd/oJwsqgrFCByOFVycNXvIdE8yZlx5zQZNXaUm6NeXWsQLtCFP7YqcO7fvhixlW9jl6cio6qpGrt3mvnXZPcTPo5CApCcoexWyYXpo7gtA1p7vhNFaelMWG8tQFr01jWCGGaOW7x9OzFIhvyLxaH12WvF935EJRlHwuIkwiDGf0dzo93edEiztVCTcwLaNckCGLP5oSxhNaJGi4CEZoIEZ8cwtlY7vQBEGJTuk187pjDpi5G5j2BGM0VYLK+DPGRlMWSyp4mtsipDlrjL45aRi+f/UTqDWqueKHqx9QWXMd6VohKTA/w5vdBNyibyDvUn+kgqypZztp1cjgvOS39P102QAtfhyelWbhkn99vRXU/I+m3owAsDzN532Hfy4S/FMl2lQtb37t8Ewc6g/fDDUTjCg0pGwyrIhg6cn690hvWxjOSHRjtgvjiCpWH5b/HQTtYFaIfM7wv15EwbGvFbRzkGVRYa7b8OdpO8fuXi2jWtfttltBS3FTYNX9hpmWSVHUNEmryuvxeImMw0I9RPJ5dp+OL3VFKICIv/Lpyvp+87UWrqJdAp0w2IAqJQXdo/SnOjqkdwjDmeLbBi+bFb0ImzNSCL32KehBhfXoMYB0GyhYWrv32kJY6mBM5IfAVZx2FTztB+Jd+0mLPYj8tBHz4o30iaGkP35w7gZBYARTcVauvQxXs7nRMfS3nRe2LJseMvIQ7sYs+WrEuQhMIFjTIBF4QJbpm1yvZyYEFFVzUtjX0bo9S1DX7W7wEaf0J418RoSwWhQHbyB5KMabcekH2viG15lyKfkcTNNo= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2021 14:52:40.7358 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd120555-0875-45f6-07ac-08d960c57f38 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: VE1EUR03FT026.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB5146 Precedence: Bulk List-Unsubscribe: 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,christopher.jones@arm.com X-Gm-Message-State: 8Ee61ptw1781QKigUYfR38R9x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1629125569; bh=n6D3RQp8X/mfVvjbQp8jyGSjQAYmAUHelM3NWZATRSk=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=BweV+84Ya9RIH8+ihxjWV2Zy2l9DydnL9xDXjMSTq7c/QQPrPp0VBIj7bptPeh0c5z3 KKU/qZXH9+B9Om3bJwlUzdB0C03qtVc8iMozNOhZkuYMZ2f+/35v1BQ72j8uy4W90lNIl 4fcp72WoA1Zx7qoyVZNafaF/B724jqtCbA8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629125571265100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Bugzilla: 3565 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3565) Update the Acpiview GTDT parser to use Acpi64.h and as such rename all occurences of "SBSA Generic Watchdog" to "Arm Generic Watchdog". Signed-off-by: Chris Jones Reviewed-by: Sami Mujawar Reviewed-by: Zhichao Gao --- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c = | 14 +++++++------- ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c= | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/Gtdt= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtPa= rser.c index d02fc4929d6fa5e04672276810b19d3f4c62efd2..d00eaafe60a5beba7ca8b833766= fdfda98760cf7 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c @@ -1,11 +1,11 @@ /** @file GTDT table parser =20 - Copyright (c) 2016 - 2020, ARM Limited. All rights reserved. + Copyright (c) 2016 - 2021, ARM Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent =20 @par Reference(s): - - ACPI 6.3 Specification - January 2019 + - ACPI 6.4 Specification - January 2021 **/ =20 #include @@ -155,7 +155,7 @@ STATIC CONST ACPI_PARSER GtBlockTimerParser[] =3D { /** An ACPI_PARSER array describing the Platform Watchdog. **/ -STATIC CONST ACPI_PARSER SBSAGenericWatchdogParser[] =3D { +STATIC CONST ACPI_PARSER ArmGenericWatchdogParser[] =3D { {L"Type", 1, 0, L"%d", NULL, NULL, NULL, NULL}, {L"Length", 2, 1, L"%d", NULL, NULL, NULL, NULL}, {L"Reserved", 1, 3, L"%x", NULL, NULL, NULL, NULL}, @@ -236,10 +236,10 @@ DumpWatchdogTimer ( ParseAcpi ( TRUE, 2, - "SBSA Generic Watchdog", + "Arm Generic Watchdog", Ptr, Length, - PARSER_PARAMS (SBSAGenericWatchdogParser) + PARSER_PARAMS (ArmGenericWatchdogParser) ); } =20 @@ -343,10 +343,10 @@ ParseAcpiGtdt ( } =20 switch (*PlatformTimerType) { - case EFI_ACPI_6_3_GTDT_GT_BLOCK: + case EFI_ACPI_6_4_GTDT_GT_BLOCK: DumpGTBlock (TimerPtr, *PlatformTimerLength); break; - case EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG: + case EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG: DumpWatchdogTimer (TimerPtr, *PlatformTimerLength); break; default: diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiView= CommandLib.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiVi= ewCommandLib.c index b30ed3fc8597b229dd15b6ad4f2aab2e3d0ca583..dcc98f1f1345cdf2d085060f096= 7eecf7342a7c7 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommand= Lib.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommand= Lib.c @@ -54,7 +54,7 @@ ACPI_TABLE_PARSER ParserList[] =3D { ParseAcpiDsdt}, {EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE, ParseAcpiFacs}, {EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiFadt}, - {EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiGtdt}, + {EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiGtdt}, {EFI_ACPI_6_3_HETEROGENEOUS_MEMORY_ATTRIBUTE_TABLE_SIGNATURE, ParseAcpiH= mat}, {EFI_ACPI_6_2_IO_REMAPPING_TABLE_SIGNATURE, ParseAcpiIort}, {EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiMadt}, --=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 (#79364): https://edk2.groups.io/g/devel/message/79364 Mute This Topic: https://groups.io/mt/84925109/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-