From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=rVaHrItd; spf=pass (domain: arm.com, ip: 40.107.2.42, mailfrom: christopher.jones@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JAqD+MqqKZFel/9EIfjxF6aVj0c8yZvIW9dQZkTeshw=; b=rVaHrItd7UPtIX43IyxeeeQOj2WwtlIK5kd4DBjVDFX55oEJDBK94RYBFThh6PmqSeZGTGKqgboG6ZfY8uuQeSIRus3QvmJtl2TDudRU6e5EXLAro5ItE2mFLil2Vat87tBbsKy2VxmJSZR3rMRgeMJ/RbeXcuCoPtt0s6m7+AY= 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 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 (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; 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 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 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 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JAqD+MqqKZFel/9EIfjxF6aVj0c8yZvIW9dQZkTeshw=; b=rVaHrItd7UPtIX43IyxeeeQOj2WwtlIK5kd4DBjVDFX55oEJDBK94RYBFThh6PmqSeZGTGKqgboG6ZfY8uuQeSIRus3QvmJtl2TDudRU6e5EXLAro5ItE2mFLil2Vat87tBbsKy2VxmJSZR3rMRgeMJ/RbeXcuCoPtt0s6m7+AY= 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 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; 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 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 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: [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> X-Mailer: git-send-email 2.17.1 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 Return-Path: Christopher.Jones@arm.com 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: BCL:0; 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-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(4636009)(39860400002)(376002)(136003)(346002)(396003)(36840700001)(46966006)(1076003)(6916009)(8936002)(478600001)(26005)(36756003)(8676002)(2906002)(36860700001)(81166007)(47076005)(5660300002)(82310400003)(82740400003)(54906003)(336012)(86362001)(7696005)(70586007)(70206006)(316002)(426003)(4326008)(83380400001)(2616005)(186003)(41533002);DIR:OUT;SFP:1101; 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 Content-Type: text/plain Buzilla: 3565 (https://bugzilla.tianocore.org/show_bug.cgi?id=3565) 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 --- 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/DynamicTablesPkg/Include/ArmNameSpaceObjects.h index 19dcae13b2191e5f0b03ea85edec1191d2a406bf..2244eafaf00939ba36a3fdf021515fcb1e152764 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -395,21 +395,21 @@ typedef struct CmArmGTBlockInfo { } CM_ARM_GTBLOCK_INFO; /** A structure that describes the - SBSA Generic Watchdog information for the Platform. + Arm Generic Watchdog information for the Platform. 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; - /// The physical base address of the SBSA Watchdog refresh frame + /// The physical base address of the Arm Watchdog refresh frame UINT64 RefreshFrameAddress; /// The watchdog interrupt UINT32 TimerGSIV; - /** 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..06a23876aea8e55d6e4c8be4471ff5aca2514f66 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 - 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 @par Reference(s): - - ACPI 6.3 Specification - January 2019 + - ACPI 6.4 Specification - January 2021 **/ @@ -41,7 +41,7 @@ GET_OBJECT_LIST ( CM_ARM_GENERIC_TIMER_INFO ); -/** 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 CfgMgrProtocol, - 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 PlatformTimerCount, IN CONST UINT32 AcpiTableRevision ) @@ -133,7 +133,7 @@ AddGenericTimerInfo ( GenericTimerInfo->CounterReadBaseAddress; Gtdt->PlatformTimerCount = PlatformTimerCount; Gtdt->PlatformTimerOffset = (PlatformTimerCount == 0) ? 0 : - sizeof (EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE); + sizeof (EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE); if (AcpiTableRevision > EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION) { Gtdt->VirtualPL2TimerGSIV = GenericTimerInfo->VirtualPL2TimerGSIV; @@ -143,7 +143,7 @@ AddGenericTimerInfo ( return Status; } -/** Add the SBSA Generic Watchdog Timers to the GTDT table. +/** Add the Arm Generic Watchdog Timers to the GTDT table. @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 * WatchdogInfoList, IN UINT32 WatchdogCount ) { - EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE * Watchdog; + EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG_STRUCTURE * Watchdog; ASSERT (Gtdt != NULL); ASSERT (WatchdogInfoList != NULL); - Watchdog = (EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE *) + Watchdog = (EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG_STRUCTURE *) ((UINT8*)Gtdt + WatchdogOffset); while (WatchdogCount-- != 0) { // Add watchdog entry DEBUG ((DEBUG_INFO, "GTDT: Watchdog = 0x%p\n", Watchdog)); - Watchdog->Type = EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG; + Watchdog->Type = EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG; Watchdog->Length = - sizeof (EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE); + sizeof (EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG_STRUCTURE); Watchdog->Reserved = EFI_ACPI_RESERVED_BYTE; Watchdog->RefreshFramePhysicalAddress = 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 * GTBlockTimerFrameList, IN UINT32 GTBlockFrameCount ) @@ -329,15 +329,15 @@ STATIC EFI_STATUS AddGTBlockList ( IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol, - 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 BlockTimerCount ) { 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 != NULL); ASSERT (GTBlockInfo != NULL); - GTBlock = (EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE *)((UINT8*)Gtdt + + GTBlock = (EFI_ACPI_6_4_GTDT_GT_BLOCK_STRUCTURE *)((UINT8*)Gtdt + GTBlockOffset); while (BlockTimerCount-- != 0) { @@ -367,8 +367,8 @@ AddGTBlockList ( return Status; } - Length = sizeof (EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE) + - (sizeof (EFI_ACPI_6_3_GTDT_GT_BLOCK_TIMER_STRUCTURE) * + Length = sizeof (EFI_ACPI_6_4_GTDT_GT_BLOCK_STRUCTURE) + + (sizeof (EFI_ACPI_6_4_GTDT_GT_BLOCK_TIMER_STRUCTURE) * GTBlockInfo->GTBlockTimerFrameCount); // Check that the length of the GT block does not @@ -386,15 +386,15 @@ AddGTBlockList ( return Status; } - GTBlock->Type = EFI_ACPI_6_3_GTDT_GT_BLOCK; + GTBlock->Type = EFI_ACPI_6_4_GTDT_GT_BLOCK; GTBlock->Length = (UINT16)Length; GTBlock->Reserved = EFI_ACPI_RESERVED_BYTE; GTBlock->CntCtlBase = GTBlockInfo->GTBlockPhysicalAddress; GTBlock->GTBlockTimerCount = GTBlockInfo->GTBlockTimerFrameCount; GTBlock->GTBlockTimerOffset = - sizeof (EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE); + sizeof (EFI_ACPI_6_4_GTDT_GT_BLOCK_STRUCTURE); - GtBlockFrame = (EFI_ACPI_6_3_GTDT_GT_BLOCK_TIMER_STRUCTURE*) + GtBlockFrame = (EFI_ACPI_6_4_GTDT_GT_BLOCK_TIMER_STRUCTURE*) ((UINT8*)GTBlock + GTBlock->GTBlockTimerOffset); // Add GT Block Timer frames @@ -413,7 +413,7 @@ AddGTBlockList ( } // Next GTBlock - GTBlock = (EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE *)((UINT8*)GTBlock + + GTBlock = (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 ( // Calculate the GTDT Table Size PlatformTimerCount = 0; - TableSize = sizeof (EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE); + TableSize = sizeof (EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE); if (BlockTimerCount != 0) { GTBlockOffset = TableSize; PlatformTimerCount += BlockTimerCount; - TableSize += (sizeof (EFI_ACPI_6_3_GTDT_GT_BLOCK_STRUCTURE) * + TableSize += (sizeof (EFI_ACPI_6_4_GTDT_GT_BLOCK_STRUCTURE) * BlockTimerCount); for (Idx = 0; Idx < BlockTimerCount; Idx++) { @@ -546,7 +546,7 @@ BuildGtdtTable ( )); goto error_handler; } - TableSize += (sizeof (EFI_ACPI_6_3_GTDT_GT_BLOCK_TIMER_STRUCTURE) * + TableSize += (sizeof (EFI_ACPI_6_4_GTDT_GT_BLOCK_TIMER_STRUCTURE) * GTBlockInfo[Idx].GTBlockTimerFrameCount); } @@ -562,7 +562,7 @@ BuildGtdtTable ( if (WatchdogCount != 0) { WatchdogOffset = TableSize; PlatformTimerCount += WatchdogCount; - TableSize += (sizeof (EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE) * + TableSize += (sizeof (EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG_STRUCTURE) * WatchdogCount); DEBUG (( DEBUG_INFO, @@ -585,7 +585,7 @@ BuildGtdtTable ( goto error_handler; } - Gtdt = (EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE*)*Table; + Gtdt = (EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE*)*Table; DEBUG (( DEBUG_INFO, "GTDT: Gtdt = 0x%p TableSize = 0x%x\n", @@ -712,9 +712,9 @@ ACPI_TABLE_GENERATOR GtdtGenerator = { // 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 -- Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")