summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunny Wang <Sunny.Wang@arm.com>2021-05-10 17:08:49 +0800
committerArd Biesheuvel <ardb@google.com>2021-05-10 17:24:27 +0200
commit7661dfff1528e907381ae49762ee12950b391449 (patch)
tree0a2724261c988ababd3b65af5ca0fbc1ff0d4041
parent7c51feb007c197a855c7404f3c4e8a29561599d9 (diff)
Platform/RaspberryPi: Update ACPI table revision
As per ACPI 6.3 specification, the DSDT/SSDT table should use revision 2 , so update the revision numbers to 2. This also fixes https://github.com/pftf/RPi4/issues/94 (FWTS failures). Testing Done: - Booted to UEFI Shell and used apciview command to check all ACPI tables' revision. - Ran FWTS test and no longer see the ACPI DSDT and SSDT revision failures. Note that the XSDT revision failure is caused by the FWTS tool's issue that got fixed in commit c522bfedc9839a474b8d590ba36bec77436d2e90 Cc: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@arm.com> Cc: Jeremy Linton <jeremy.linton@arm.com> Cc: Sami Mujawar <sami.mujawar@arm.com> Cc: Pete Batard <pete@akeo.ie> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org> Signed-off-by: Sunny Wang <sunny.wang@arm.com> Reviewed-by: Pete Batard <pete@akeo.ie> Tested-by: Pete Batard <pete@akeo.ie> # Windows 10 boot
-rw-r--r--Platform/RaspberryPi/AcpiTables/Dsdt.asl3
-rw-r--r--Platform/RaspberryPi/AcpiTables/Emmc.asl4
-rw-r--r--Platform/RaspberryPi/AcpiTables/SsdtThermal.asl2
3 files changed, 5 insertions, 4 deletions
diff --git a/Platform/RaspberryPi/AcpiTables/Dsdt.asl b/Platform/RaspberryPi/AcpiTables/Dsdt.asl
index d116f965..54fa3eca 100644
--- a/Platform/RaspberryPi/AcpiTables/Dsdt.asl
+++ b/Platform/RaspberryPi/AcpiTables/Dsdt.asl
@@ -5,6 +5,7 @@
* Copyright (c) 2020, Pete Batard <pete@akeo.ie>
* Copyright (c) 2018-2020, Andrey Warkentin <andrey.warkentin@gmail.com>
* Copyright (c) Microsoft Corporation. All rights reserved.
+ * Copyright (c) 2021, ARM Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*
@@ -58,7 +59,7 @@
Store (Length, LE ## Index) \
Add (MI ## Index, LE ## Index - 1, MA ## Index)
-DefinitionBlock ("Dsdt.aml", "DSDT", 5, "RPIFDN", "RPI", 2)
+DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
{
Scope (\_SB_)
{
diff --git a/Platform/RaspberryPi/AcpiTables/Emmc.asl b/Platform/RaspberryPi/AcpiTables/Emmc.asl
index 179dd3ec..88811eb3 100644
--- a/Platform/RaspberryPi/AcpiTables/Emmc.asl
+++ b/Platform/RaspberryPi/AcpiTables/Emmc.asl
@@ -1,6 +1,6 @@
/** @file
*
- * Copyright (c) 2021 Arm. All rights reserved.
+ * Copyright (c) 2021, ARM Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*
@@ -11,7 +11,7 @@
#include "AcpiTables.h"
-DefinitionBlock (__FILE__, "SSDT", 5, "RPIFDN", "RPI4EMMC", 2)
+DefinitionBlock (__FILE__, "SSDT", 2, "RPIFDN", "RPI4EMMC", 2)
{
Scope (\_SB_)
{
diff --git a/Platform/RaspberryPi/AcpiTables/SsdtThermal.asl b/Platform/RaspberryPi/AcpiTables/SsdtThermal.asl
index 862637ac..40e40b0d 100644
--- a/Platform/RaspberryPi/AcpiTables/SsdtThermal.asl
+++ b/Platform/RaspberryPi/AcpiTables/SsdtThermal.asl
@@ -14,7 +14,7 @@
#include <IndustryStandard/Acpi.h>
-DefinitionBlock (__FILE__, "SSDT", 5, "RPIFDN", "RPITHFAN", 2)
+DefinitionBlock (__FILE__, "SSDT", 2, "RPIFDN", "RPITHFAN", 2)
{
External (\_SB_.EC00, DeviceObj)
External (\_SB_.EC00.TZ00, DeviceObj)