From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (EUR04-DB3-obe.outbound.protection.outlook.com [40.107.6.64]) by mx.groups.io with SMTP id smtpd.web10.39482.1629208287372171590 for ; Tue, 17 Aug 2021 06:51:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=gKWYnhD3; spf=pass (domain: arm.com, ip: 40.107.6.64, 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=pTXotg+/pyS9zxRV3hHYN5LI+hmNvJ3RJwTP5eft5bE=; b=gKWYnhD3GmDHDk+7cVwe9o9l/UHAc4SAQCMmA0IHQlkKFH3Y3hVxGXh2YEcFyVCHcaIDJP9q7pPcdmeG9Z0Cw7TYSAT4bOcx3khrfKbwzTPZioXo4GGya56pkMD5uLUG7BahpRpYXOk5eA2uAhlPQx2Caz/sv6F+r0N7gpj/j5E= Received: from DB6PR0802CA0039.eurprd08.prod.outlook.com (2603:10a6:4:a3::25) by AM0PR08MB3298.eurprd08.prod.outlook.com (2603:10a6:208:5e::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17; Tue, 17 Aug 2021 13:51:23 +0000 Received: from DB5EUR03FT027.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:a3:cafe::dc) by DB6PR0802CA0039.outlook.office365.com (2603:10a6:4:a3::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16 via Frontend Transport; Tue, 17 Aug 2021 13:51:22 +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 DB5EUR03FT027.mail.protection.outlook.com (10.152.20.121) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16 via Frontend Transport; Tue, 17 Aug 2021 13:51:22 +0000 Received: ("Tessian outbound 56612e04f172:v103"); Tue, 17 Aug 2021 13:51:22 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 777d875c8248fb1d X-CR-MTA-TID: 64aa7808 Received: from eb5d653bc6c3.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 4E799FED-42D7-4AD8-946E-5EB1242B8AAB.1; Tue, 17 Aug 2021 13:51:06 +0000 Received: from EUR01-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id eb5d653bc6c3.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 17 Aug 2021 13:51:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lBtAgzxChs4mwt5IQmzpT8s2DrF8TKftR24pNjZjvRWnuW2Ie0PxtS7igU+YZHJzHDKClMtwzFyMiSCK+lczaA1fLWBwZmOYkpGdV2to+C8l2MS3gJebyJu3xhBMzuMu6QuBFpok32Kw85jpv1CJblObSeZkBJoAtmOr3g9fUjBBBbD1ltKEX934PKKtnpVyvoDpYz4YXiuNYDEGp9N1lBAHC+n2xUA5k+A535ThvFRtQh8HArPr47EYl6OUzp9gDaWvf42gGenpE5ocYifwl76VnYNx5W7lZkJFA/jcxkrD2A7wSDcsrH3MKu4A7oyN8+AyHmBoTphqk9SLC7GbKA== 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=pTXotg+/pyS9zxRV3hHYN5LI+hmNvJ3RJwTP5eft5bE=; b=Ng9Y7AfH4EKKMPaYEk2lQ5NefDvpObpfhqpFNs4BF5SIzDbJS2BMRCTAQ/nehAAbObt98X42MjJnmap3ofQMKS5LH/1cIGarMqTMTu4eGDZtbMPpZN34FYLRkUZLv5a9nuj3kdGM4Q0Wmp2AqJabaS8olhIGGLWthdua9l1wGowzlHpe2RHD1vKV+ljafsXzS8VxIFnMKwp+btH43Y+iTwbJ+1BLVHGwdx3ZwLQPFPebYWcHdaj+3qko+w8F/E48YRMQRbP/6dQdFlHERNuPFGDe/PXjk3LkQDRdqpnJObGsVRaLcX9qWh7dA292c9GF1H3ccKRqixQWMadaq7PsxQ== 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=pTXotg+/pyS9zxRV3hHYN5LI+hmNvJ3RJwTP5eft5bE=; b=gKWYnhD3GmDHDk+7cVwe9o9l/UHAc4SAQCMmA0IHQlkKFH3Y3hVxGXh2YEcFyVCHcaIDJP9q7pPcdmeG9Z0Cw7TYSAT4bOcx3khrfKbwzTPZioXo4GGya56pkMD5uLUG7BahpRpYXOk5eA2uAhlPQx2Caz/sv6F+r0N7gpj/j5E= Received: from DB9PR02CA0023.eurprd02.prod.outlook.com (2603:10a6:10:1d9::28) by PAXPR08MB6846.eurprd08.prod.outlook.com (2603:10a6:102:15d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16; Tue, 17 Aug 2021 13:51:01 +0000 Received: from DB5EUR03FT011.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:1d9:cafe::6b) by DB9PR02CA0023.outlook.office365.com (2603:10a6:10:1d9::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19 via Frontend Transport; Tue, 17 Aug 2021 13:51:01 +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 DB5EUR03FT011.mail.protection.outlook.com (10.152.20.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4415.16 via Frontend Transport; Tue, 17 Aug 2021 13:51:01 +0000 Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.14; Tue, 17 Aug 2021 13:50:59 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Tue, 17 Aug 2021 13:51:00 +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; Tue, 17 Aug 2021 13:50:58 +0000 From: "Chris Jones" To: CC: , , , , , Subject: [PATCH v1] DynamicTablesPkg: Update FADT generator to ACPI 6.4 Date: Tue, 17 Aug 2021 14:50:58 +0100 Message-ID: <20210817135058.28579-1-christopher.jones@arm.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d5fffac5-bcad-4f8f-fa42-08d961861956 X-MS-TrafficTypeDiagnostic: PAXPR08MB6846:|AM0PR08MB3298: 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: 9Ujdwk5eAKcwDy/FctdVBWh+7R+9zgTnBYljgbikk8tZa45VZgFM/81lWX0uDYu7aLGXE2K57PPtp8zJaocqD07y/X0oA3UtZi3cOWcrMCkOrIC9eTIEtznYWlHZE6iXodKLvfni8a3P1hwbSGhNNPmQgEDG2AyVsRLiJfaq6O0owLNj8AW/h8RX9nOGWry2UTZylWlfPz7Hh+JszcWcdwmgMlrPmvHRzUKEIu1nAvLki105rDFxQZn33hko+kFxM86sDTK75R27szqwm+l537gAjxKE9INCokI6IbzQQIyVjqGqfRdT6HEwa0JQEBfTKQnE5HsUMRwPlOGyMYnLw29G1DceWuLAfesf/P2WFcroQK6ZZEkN+ms+amiyyBQxaCYCHGIWAbhElGhdP+SC6wjFTQE92K6gZYqXkvRZvvNfQYfk3jK/Bn39HQgmxJEzZhyuKPFX6m0KuOaE/hjmaSk9mLNtLlFwBcYf5gdGzlqLzYhnMREOBsbzKm0wtSoBajjCzF/0Tqc/FFBEdCkyeatSSviLmr+8BL0PoBqKZHkSiyVCYL1WYlK+EtCfxX8+ZqOmjApZQHA/I/ije4QGYR40K0kQrbO2q1sI7HUi9/RUKAtGQyICWkNLqW0WsaggXjWTxu+K/CEfjvOpb1Z5T2+c3ywYAMWo6vke6GXn1jEzIxP00BI2NRCwx0qTo8JgcQDJ5HXBo3vy6+tL0BBQgi6UF5+UJ3CDPoMI14iwjwUft08FRpymkDujenEzXpEebFz8HPzDVfWKBtj2Z29feTKuaWfV2fiAy92pjBjzp1GLfw2JkBTF0JvD+qec+91FjwDnAu/zJbxMtKpqmIHKE444oXs6mwgVbQij585j4LMrzPQEKzMMdGWucxGWWKiLwFkK2dMy21tA5hEvGk+hyg== 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)(508600001)(82310400003)(34020700004)(2616005)(8936002)(356005)(7696005)(47076005)(8676002)(426003)(4326008)(1076003)(966005)(336012)(5660300002)(83380400001)(26005)(16799955002)(316002)(54906003)(186003)(6916009)(36756003)(81166007)(36860700001)(2906002)(70586007)(15650500001)(70206006)(86362001)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6846 Return-Path: Christopher.Jones@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT027.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 1123c3e2-c331-4172-5846-08d961860c60 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5wO/QmIijE1BM5SUWIOj/0FWrk+zbM3kaluphbwD4eq7PhNDM9f79R8Zy1QxsRxjahfhhuvNf+dxC3FV9VnG5DJpQ3zfoZybNPJhKfbYgRBuhcgpLd88V+Kw+elCmwzB5yfM808RpiSGum+15wS1jLid7TnMfU9VdT4H4sDYvEu2uXO7LUtgchYDPTXpY5WqZFX3JY4In9BwxAQwD4eexJ9drG0VcBg0YQxE08s8YI2xR9zdRy6bMpxLFGHQbSsyVEF4XkBKp8p2gxBodEDwMzZa1+UwubmE+RGqsdhA/B50AsDhOdeoz7axskDDDO4Ww6w/iBQHhcSWMMCqBVClcW3FqrHUV3peudWhcOZmJM9+DgCV0xJ4jb5oNrReFsW7VgNDqXFvVEpWkoABLhw8VqZchLARRcM8V3PEIRr5pFy6nMebvGwy4RATKQxw82mlRZDO3w4UfJxu1n15B8cWj7HYjtmV31GK4tFkIviZkvPe7FGABDdT17RmSJ+n4alGJnK91PNtvX8xWgjlhUTorcf9QUWZAfO3ZEomSOzND3eXBN8O7pNESN/Dtzyj+XkfUkUvuLDGjrQlFrtkMdosltAPifN2AFgMEnRffYX5JYxRhorVEtRpOLZ2UixvmmMEUW+2dAysr1NInVfURmwbY/obFw+RNeKVA3nQgbic9uI9qfE8R6xyOy3k7ZkrS2bivO8f46clq3EjTyCkKVt8amXWKY5jCAM3sNmRXzV3GkxAYvBQcCpiSq8hFR6wGEuyVYGk4Ys8PN8ugxan1Dg5I2kOCQ4hBEPbEIn+YBpYBRhOYI5YPL5GiFCKwiMNZGRrtXFV+0RqbJc/S1l8rPSv7w== 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)(376002)(39860400002)(346002)(396003)(136003)(46966006)(36840700001)(54906003)(5660300002)(1076003)(426003)(336012)(36756003)(478600001)(2616005)(4326008)(83380400001)(16799955002)(316002)(2906002)(82310400003)(8936002)(82740400003)(966005)(70206006)(86362001)(81166007)(70586007)(7696005)(47076005)(15650500001)(36860700001)(26005)(6916009)(186003)(8676002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2021 13:51:22.8198 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d5fffac5-bcad-4f8f-fa42-08d961861956 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: DB5EUR03FT027.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3298 Content-Type: text/plain Bugzilla: 3568 (https://bugzilla.tianocore.org/show_bug.cgi?id=3568) Update the FADT generator to use Acpi64.h. As the FADT revision tracks the ACPI revision this updates the minor revision value generated. Mantis ID for change: https://mantis.uefi.org/mantis/view.php?id=2105 Signed-off-by: Chris Jones --- DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c | 104 ++++++++++---------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c index b748c982b285a8f6c012c0e08fb95c9904f47730..b4ebd463da02ca37f22b73413b038471081f64e7 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c @@ -1,11 +1,11 @@ /** @file FADT 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 **/ @@ -32,8 +32,8 @@ Requirements: /** This macro defines the FADT flag options for ARM Platforms. */ -#define FADT_FLAGS (EFI_ACPI_6_3_HW_REDUCED_ACPI | \ - EFI_ACPI_6_3_LOW_POWER_S0_IDLE_CAPABLE) +#define FADT_FLAGS (EFI_ACPI_6_4_HW_REDUCED_ACPI | \ + EFI_ACPI_6_4_LOW_POWER_S0_IDLE_CAPABLE) /** This macro defines the valid mask for the FADT flag option if HW_REDUCED_ACPI flag in the table is set. @@ -42,47 +42,47 @@ Requirements: 22-31 (reserved). Valid bits are: - EFI_ACPI_6_3_WBINVD BIT0 - EFI_ACPI_6_3_PWR_BUTTON BIT4 - EFI_ACPI_6_3_SLP_BUTTON BIT5 - EFI_ACPI_6_3_FIX_RTC BIT6 - EFI_ACPI_6_3_DCK_CAP BIT9 - EFI_ACPI_6_3_RESET_REG_SUP BIT10 - EFI_ACPI_6_3_SEALED_CASE BIT11 - EFI_ACPI_6_3_HEADLESS BIT12 - EFI_ACPI_6_3_USE_PLATFORM_CLOCK BIT15 - EFI_ACPI_6_3_FORCE_APIC_CLUSTER_MODEL BIT18 - EFI_ACPI_6_3_FORCE_APIC_PHYSICAL_DESTINATION_MODE BIT19 - EFI_ACPI_6_3_HW_REDUCED_ACPI BIT20 - EFI_ACPI_6_3_LOW_POWER_S0_IDLE_CAPABLE BIT21 + EFI_ACPI_6_4_WBINVD BIT0 + EFI_ACPI_6_4_PWR_BUTTON BIT4 + EFI_ACPI_6_4_SLP_BUTTON BIT5 + EFI_ACPI_6_4_FIX_RTC BIT6 + EFI_ACPI_6_4_DCK_CAP BIT9 + EFI_ACPI_6_4_RESET_REG_SUP BIT10 + EFI_ACPI_6_4_SEALED_CASE BIT11 + EFI_ACPI_6_4_HEADLESS BIT12 + EFI_ACPI_6_4_USE_PLATFORM_CLOCK BIT15 + EFI_ACPI_6_4_FORCE_APIC_CLUSTER_MODEL BIT18 + EFI_ACPI_6_4_FORCE_APIC_PHYSICAL_DESTINATION_MODE BIT19 + EFI_ACPI_6_4_HW_REDUCED_ACPI BIT20 + EFI_ACPI_6_4_LOW_POWER_S0_IDLE_CAPABLE BIT21 */ #define VALID_HARDWARE_REDUCED_FLAG_MASK ( \ - EFI_ACPI_6_3_WBINVD | \ - EFI_ACPI_6_3_PWR_BUTTON | \ - EFI_ACPI_6_3_SLP_BUTTON | \ - EFI_ACPI_6_3_FIX_RTC | \ - EFI_ACPI_6_3_DCK_CAP | \ - EFI_ACPI_6_3_RESET_REG_SUP | \ - EFI_ACPI_6_3_SEALED_CASE | \ - EFI_ACPI_6_3_HEADLESS | \ - EFI_ACPI_6_3_USE_PLATFORM_CLOCK | \ - EFI_ACPI_6_3_FORCE_APIC_CLUSTER_MODEL | \ - EFI_ACPI_6_3_FORCE_APIC_PHYSICAL_DESTINATION_MODE | \ - EFI_ACPI_6_3_HW_REDUCED_ACPI | \ - EFI_ACPI_6_3_LOW_POWER_S0_IDLE_CAPABLE) + EFI_ACPI_6_4_WBINVD | \ + EFI_ACPI_6_4_PWR_BUTTON | \ + EFI_ACPI_6_4_SLP_BUTTON | \ + EFI_ACPI_6_4_FIX_RTC | \ + EFI_ACPI_6_4_DCK_CAP | \ + EFI_ACPI_6_4_RESET_REG_SUP | \ + EFI_ACPI_6_4_SEALED_CASE | \ + EFI_ACPI_6_4_HEADLESS | \ + EFI_ACPI_6_4_USE_PLATFORM_CLOCK | \ + EFI_ACPI_6_4_FORCE_APIC_CLUSTER_MODEL | \ + EFI_ACPI_6_4_FORCE_APIC_PHYSICAL_DESTINATION_MODE | \ + EFI_ACPI_6_4_HW_REDUCED_ACPI | \ + EFI_ACPI_6_4_LOW_POWER_S0_IDLE_CAPABLE) #pragma pack(1) -/** The AcpiFadt is a template EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE +/** The AcpiFadt is a template EFI_ACPI_6_4_FIXED_ACPI_DESCRIPTION_TABLE structure used for generating the FADT Table. Note: fields marked with "{Template}" will be updated dynamically. */ STATIC -EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE AcpiFadt = { +EFI_ACPI_6_4_FIXED_ACPI_DESCRIPTION_TABLE AcpiFadt = { ACPI_HEADER ( - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE, - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_REVISION + EFI_ACPI_6_4_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, + EFI_ACPI_6_4_FIXED_ACPI_DESCRIPTION_TABLE, + EFI_ACPI_6_4_FIXED_ACPI_DESCRIPTION_TABLE_REVISION ), // UINT32 FirmwareCtrl 0, @@ -91,7 +91,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE AcpiFadt = { // UINT8 Reserved0 EFI_ACPI_RESERVED_BYTE, // UINT8 PreferredPmProfile - EFI_ACPI_6_3_PM_PROFILE_UNSPECIFIED, // {Template}: Power Management Profile + EFI_ACPI_6_4_PM_PROFILE_UNSPECIFIED, // {Template}: Power Management Profile // UINT16 SciInt 0, // UINT32 SmiCmd @@ -160,37 +160,37 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE AcpiFadt = { 0, // UINT32 Flags FADT_FLAGS, - // EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE ResetReg + // EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE ResetReg NULL_GAS, // UINT8 ResetValue 0, // UINT16 ArmBootArch - EFI_ACPI_6_3_ARM_PSCI_COMPLIANT, // {Template}: ARM Boot Architecture Flags + EFI_ACPI_6_4_ARM_PSCI_COMPLIANT, // {Template}: ARM Boot Architecture Flags // UINT8 MinorRevision - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_MINOR_REVISION, + EFI_ACPI_6_4_FIXED_ACPI_DESCRIPTION_TABLE_MINOR_REVISION, // UINT64 XFirmwareCtrl 0, // UINT64 XDsdt 0, - // EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE XPm1aEvtBlk + // EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE XPm1aEvtBlk NULL_GAS, - // EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE XPm1bEvtBlk + // EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE XPm1bEvtBlk NULL_GAS, - // EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE XPm1aCntBlk + // EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE XPm1aCntBlk NULL_GAS, - // EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE XPm1bCntBlk + // EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE XPm1bCntBlk NULL_GAS, - // EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE XPm2CntBlk + // EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE XPm2CntBlk NULL_GAS, - // EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE XPmTmrBlk + // EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE XPmTmrBlk NULL_GAS, - // EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE XGpe0Blk + // EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE XGpe0Blk NULL_GAS, - // EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE XGpe1Blk + // EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE XGpe1Blk NULL_GAS, - // EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE SleepControlReg + // EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE SleepControlReg NULL_GAS, - // EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE SleepStatusReg + // EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE SleepStatusReg NULL_GAS, // UINT64 HypervisorVendorIdentity EFI_ACPI_RESERVED_QWORD // {Template}: Hypervisor Vendor ID @@ -532,7 +532,7 @@ BuildFadtTable ( This, (EFI_ACPI_DESCRIPTION_HEADER*)&AcpiFadt, AcpiTableInfo, - sizeof (EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE) + sizeof (EFI_ACPI_6_4_FIXED_ACPI_DESCRIPTION_TABLE) ); if (EFI_ERROR (Status)) { DEBUG (( @@ -614,9 +614,9 @@ ACPI_TABLE_GENERATOR FadtGenerator = { // Generator Description L"ACPI.STD.FADT.GENERATOR", // ACPI Table Signature - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, + EFI_ACPI_6_4_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, // ACPI Table Revision supported by this Generator - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_REVISION, + EFI_ACPI_6_4_FIXED_ACPI_DESCRIPTION_TABLE_REVISION, // Minimum supported ACPI Table Revision EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE_REVISION, // Creator ID -- Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")