On Mon, 10 May 2021 at 13:13, Pete Batard <p...@akeo.ie> wrote: > > On 2021.05.10 10:08, Sunny Wang wrote: > > 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-mahm...@arm.com> > > Cc: Jeremy Linton <jeremy.lin...@arm.com> > > Cc: Sami Mujawar <sami.muja...@arm.com> > > Cc: Pete Batard <p...@akeo.ie> > > Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> > > Signed-off-by: Sunny Wang <sunny.w...@arm.com> > > --- > > 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/RaspberryPi/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 <p...@akeo.ie> > > * Copyright (c) 2018-2020, Andrey Warkentin <andrey.warken...@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 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 @@ > > > > #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 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 @@ > > > > #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) > > > > Reviewed-by: Pete Batard <p...@akeo.ie> > Tested-by: Pete Batard <p...@akeo.ie> (Windows 10 boot)
Thanks all. Pushed as a996c765008d..7661dfff1528 (I added a preceding patch to change the line endings of SsdtThermal.asl to CR/LF, or the patch wouldn't apply) -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#74879): https://edk2.groups.io/g/devel/message/74879 Mute This Topic: https://groups.io/mt/82715296/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
