From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.29458.1620637768352485826 for ; Mon, 10 May 2021 02:09:28 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: sunny.wang@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D9BB5106F; Mon, 10 May 2021 02:09:27 -0700 (PDT) Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1BDC03F73B; Mon, 10 May 2021 02:09:25 -0700 (PDT) From: "Sunny Wang" To: devel@edk2.groups.io Cc: Sunny Wang , Samer El-Haj-Mahmoud , Jeremy Linton , Sami Mujawar , Pete Batard , Ard Biesheuvel , Sunny Wang Subject: [PATCH 1/1] Platform/RaspberryPi: Update ACPI table revision Date: Mon, 10 May 2021 17:08:49 +0800 Message-Id: <20210510090849.1828-1-Sunny.Wang@arm.com> X-Mailer: git-send-email 2.31.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 Cc: Jeremy Linton Cc: Sami Mujawar Cc: Pete Batard Cc: Ard Biesheuvel Signed-off-by: Sunny Wang --- Platform/RaspberryPi/AcpiTables/Dsdt.asl | 3 ++- Platform/RaspberryPi/AcpiTables/Emmc.asl | 4 ++-- Platform/RaspberryPi/AcpiTables/SsdtThermal.asl | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Platform/RaspberryPi/AcpiTables/Dsdt.asl b/Platform/Raspberr= yPi/AcpiTables/Dsdt.asl index d116f965e1..54fa3eca7b 100644 --- a/Platform/RaspberryPi/AcpiTables/Dsdt.asl +++ b/Platform/RaspberryPi/AcpiTables/Dsdt.asl @@ -5,6 +5,7 @@ * Copyright (c) 2020, Pete Batard * Copyright (c) 2018-2020, Andrey Warkentin * 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) =20 -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/Raspberr= yPi/AcpiTables/Emmc.asl index 179dd3ecdb..88811eb354 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 @@ =20 #include "AcpiTables.h" =20 -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/R= aspberryPi/AcpiTables/SsdtThermal.asl index acfa4699bb..e82f55bebd 100644 --- a/Platform/RaspberryPi/AcpiTables/SsdtThermal.asl +++ b/Platform/RaspberryPi/AcpiTables/SsdtThermal.asl @@ -2,7 +2,7 @@ * * Secondary System Description Table (SSDT) for active (fan) cooling * - * Copyright (c) 2020, Arm Ltd. All rights reserved. + * Copyright (c) 2020 - 2021, ARM Limited. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -14,7 +14,7 @@ =20 #include =20 -DefinitionBlock (__FILE__, "SSDT", 5, "RPIFDN", "RPITHFAN", 2) +DefinitionBlock (__FILE__, "SSDT", 2, "RPIFDN", "RPITHFAN", 2) { External (\_SB_.EC00, DeviceObj) External (\_SB_.EC00.TZ00, DeviceObj) --=20 2.31.0.windows.1