From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by mx.groups.io with SMTP id smtpd.web10.33320.1620660344063824781 for ; Mon, 10 May 2021 08:25:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=R01NGzik; spf=pass (domain: kernel.org, ip: 198.145.29.99, mailfrom: ardb@kernel.org) Received: by mail.kernel.org (Postfix) with ESMTPSA id 6BB4E61107 for ; Mon, 10 May 2021 15:25:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620660343; bh=wrzq5l6vEpmXpWSDXyYY+X6FxAhd012S0+KarorTVWk=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=R01NGzik6w6PRADH01tOeAXW47APUJ63F2n0Tl5VuWS8eODPsIiMvoLNy6J7lQs8R SWgcYQCzIy0FuwTdm4IqznbAk4omBYFU+PbjCesRY4uM0md7IMRgmfbYBnHj5bPzeG sH6O3x7RNTOZwTZ1U4XLQ61kWy1gp3kdgITXvvYtOBhurEGt2sosSC10jd2gR1rphV wH0DjmZHpCoAfVxpmvlRxQLcYqjvVbSpQo7reT0jHrsQInVuRTiECp/H9e0mgOJoQ5 PzEUXApAz/jitRCQsr0vRJDlhddQ/O15NUjbZc5o6MmeRXR7wAkWtKTJ6ywOINDOof 7ZY1YB6OFKtlQ== Received: by mail-oi1-f174.google.com with SMTP id k25so16135599oic.4 for ; Mon, 10 May 2021 08:25:43 -0700 (PDT) X-Gm-Message-State: AOAM5310blpShTdkE23+xq8I6DCPHp7vTPvBT+4duZ+sbYZbUf8IuMUn t1oRqeWrlFo8v54xtwyMWr4MQ5x31m0NpRPCmnY= X-Google-Smtp-Source: ABdhPJzdIXUKrwQ3FXEDHpEwOqbyiiLS8Dco92ojXzbbiRNAJQtyF6hzvpEJJSpNKU+8Ukfxh+zTn/ztDqCrSL0JXjU= X-Received: by 2002:aca:4056:: with SMTP id n83mr26589756oia.47.1620660342798; Mon, 10 May 2021 08:25:42 -0700 (PDT) MIME-Version: 1.0 References: <20210510090849.1828-1-Sunny.Wang@arm.com> <6ae92d81-0d90-20dc-e0b9-64b1f4dc65cd@akeo.ie> In-Reply-To: <6ae92d81-0d90-20dc-e0b9-64b1f4dc65cd@akeo.ie> From: "Ard Biesheuvel" Date: Mon, 10 May 2021 17:25:31 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 1/1] Platform/RaspberryPi: Update ACPI table revision To: Pete Batard Cc: Sunny Wang , edk2-devel-groups-io , Samer El-Haj-Mahmoud , Jeremy Linton , Sami Mujawar , Ard Biesheuvel Content-Type: text/plain; charset="UTF-8" On Mon, 10 May 2021 at 13:13, Pete Batard 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 > > 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/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 > > * 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) > > > > -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 > > > > -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 > Tested-by: Pete Batard (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)