* [PATCH 1/1] Platform/RaspberryPi: Update ACPI table revision
@ 2021-05-10 9:08 Sunny Wang
2021-05-10 11:13 ` Pete Batard
0 siblings, 1 reply; 3+ messages in thread
From: Sunny Wang @ 2021-05-10 9:08 UTC (permalink / raw)
To: devel
Cc: Sunny Wang, Samer El-Haj-Mahmoud, Jeremy Linton, Sami Mujawar,
Pete Batard, Ard Biesheuvel, Sunny Wang
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>
---
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 <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 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)
--
2.31.0.windows.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] Platform/RaspberryPi: Update ACPI table revision
2021-05-10 9:08 [PATCH 1/1] Platform/RaspberryPi: Update ACPI table revision Sunny Wang
@ 2021-05-10 11:13 ` Pete Batard
2021-05-10 15:25 ` Ard Biesheuvel
0 siblings, 1 reply; 3+ messages in thread
From: Pete Batard @ 2021-05-10 11:13 UTC (permalink / raw)
To: Sunny Wang, devel
Cc: Samer El-Haj-Mahmoud, Jeremy Linton, Sami Mujawar, Ard Biesheuvel
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-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>
> ---
> 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 <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 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 <pete@akeo.ie>
Tested-by: Pete Batard <pete@akeo.ie> (Windows 10 boot)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] Platform/RaspberryPi: Update ACPI table revision
2021-05-10 11:13 ` Pete Batard
@ 2021-05-10 15:25 ` Ard Biesheuvel
0 siblings, 0 replies; 3+ messages in thread
From: Ard Biesheuvel @ 2021-05-10 15:25 UTC (permalink / raw)
To: Pete Batard
Cc: Sunny Wang, edk2-devel-groups-io, Samer El-Haj-Mahmoud,
Jeremy Linton, Sami Mujawar, Ard Biesheuvel
On Mon, 10 May 2021 at 13:13, Pete Batard <pete@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-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>
> > ---
> > 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 <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 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 <pete@akeo.ie>
> Tested-by: Pete Batard <pete@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)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-10 15:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-10 9:08 [PATCH 1/1] Platform/RaspberryPi: Update ACPI table revision Sunny Wang
2021-05-10 11:13 ` Pete Batard
2021-05-10 15:25 ` Ard Biesheuvel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox