[edk2-devel] [edk2-platforms][PATCH V1 1/1] Platform/ARM/SgiPkg: Update ACPI Table revision
Samer El-Haj-Mahmoud
samer.el-haj-mahmoud at arm.com
Fri Jan 29 14:15:49 UTC 2021
Adding Ard's new email
PcdAcpiExposedTableVersions already defaults (in MdeModulePkg.dec) to 0x20 for AARCH64. This was done as part of a commit a while go to fix this for all Aarch64 platforms: https://github.com/tianocore/edk2/commit/40b9ca6beb8c5cd11e9fb30ebc447c7889157eff.
> -----Original Message-----
> From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Sami
> Mujawar via groups.io
> Sent: Friday, January 29, 2021 4:52 AM
> To: devel at edk2.groups.io; Pranav Madhu <Pranav.Madhu at arm.com>
> Cc: Ard Biesheuvel <Ard.Biesheuvel at arm.com>; Leif Lindholm
> <leif at nuviainc.com>; nd <nd at arm.com>
> Subject: Re: [edk2-devel] [edk2-platforms][PATCH V1 1/1]
> Platform/ARM/SgiPkg: Update ACPI Table revision
>
> Hi Pranav,
>
> PcdAcpiExposedTableVersions = 2 is needed to meet the BBR requirement,
> see Arm Base Boot Requirements 1.0, Section 8.3.1.1 RSDP
> "Within the RSDP, the RsdtAddress field must be null (zero) and the
> XsdtAddresss must be a valid, non-null, 64-bit value"
> So, you might want to update the commit message to reflect this.
>
> Otherwise, these changes look fine to me.
>
> Reviewed-by: Sami Mujawar <sami.mujawar at arm.com>
>
> Regards,
>
> Sami Mujawar
>
> -----Original Message-----
> From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Pranav
> Madhu via groups.io
> Sent: 15 January 2021 05:58 PM
> To: devel at edk2.groups.io
> Cc: Ard Biesheuvel <Ard.Biesheuvel at arm.com>; Leif Lindholm
> <leif at nuviainc.com>
> Subject: [edk2-devel] [edk2-platforms][PATCH V1 1/1]
> Platform/ARM/SgiPkg: Update ACPI Table revision
>
> Fix the ACPI DSDT/SSDT table version numbers. As per ACPI 6.3 specification,
> the DSDT/SSDT table should use version 2 instead of 1. In addition to this,
> update 'PcdAcpiExposedTableVersions' to avoid building RSDT table into ACPI
> firmware volume because the platforms supported under SgiPkg are 64-bit
> systems only and require only the XSDT table.
>
> Signed-off-by: Pranav Madhu <pranav.madhu at arm.com>
> ---
> Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 5 ++++-
> Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl | 4 ++--
> Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl | 4 ++--
> Platform/ARM/SgiPkg/AcpiTables/RdN2/Dsdt.asl | 4 ++--
> Platform/ARM/SgiPkg/AcpiTables/RdV1/Dsdt.asl | 4 ++--
> Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Dsdt.asl | 4 ++--
> Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl | 4 ++--
> Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl | 4 ++--
> Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl | 4 ++--
> 9 files changed, 20 insertions(+), 17 deletions(-)
>
> diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
> b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
> index 215fde971e8c..f5c3ccd13069 100644
> --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
> +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
> @@ -1,5 +1,5 @@
> #
> -# Copyright (c) 2018-2020, ARM Limited. All rights reserved.
> +# Copyright (c) 2018-2021, ARM Limited. All rights reserved.
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -116,6 +116,9 @@
> gArmTokenSpaceGuid.PcdSystemMemoryBase|0x80000000
> gArmTokenSpaceGuid.PcdSystemMemorySize|0x7F000000
>
> + # ACPI Table Version
> + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiExposedTableVersions|0x20
> +
> #
> # PCIe
> #
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl
> b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl
> index d66c7cbf4183..04fd3bd0a1f8 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl
> +++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl
> @@ -1,7 +1,7 @@
> /** @file
> * Differentiated System Description Table Fields (DSDT)
> *
> -* Copyright (c) 2018-2020, ARM Ltd. All rights reserved.
> +* Copyright (c) 2018-2021, ARM Ltd. All rights reserved.
> *
> * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> @@ -10,7 +10,7 @@
> #include "SgiPlatform.h"
> #include "SgiAcpiHeader.h"
>
> -DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI",
> +DefinitionBlock ("DsdtTable.aml", "DSDT", 2, "ARMLTD", "ARMSGI",
> EFI_ACPI_ARM_OEM_REVISION) {
> Scope (_SB) {
> //
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl
> b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl
> index cb05eed35878..d9bac33898b1 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl
> +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl
> @@ -1,7 +1,7 @@
> /** @file
> * Differentiated System Description Table Fields (DSDT)
> *
> -* Copyright (c) 2018-2020, ARM Ltd. All rights reserved.
> +* Copyright (c) 2018-2021, ARM Ltd. All rights reserved.
> *
> * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> @@ -10,7 +10,7 @@
> #include "SgiPlatform.h"
> #include "SgiAcpiHeader.h"
>
> -DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI",
> +DefinitionBlock ("DsdtTable.aml", "DSDT", 2, "ARMLTD", "ARMSGI",
> EFI_ACPI_ARM_OEM_REVISION) {
> Scope (_SB) {
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN2/Dsdt.asl
> b/Platform/ARM/SgiPkg/AcpiTables/RdN2/Dsdt.asl
> index 8688fd8d6b90..42cb8655b4fb 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/RdN2/Dsdt.asl
> +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN2/Dsdt.asl
> @@ -1,7 +1,7 @@
> /** @file
> * Differentiated System Description Table Fields (DSDT)
> *
> -* Copyright (c) 2020, Arm Ltd. All rights reserved.
> +* Copyright (c) 2020-2021, Arm Ltd. All rights reserved.
> *
> * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> @@ -10,7 +10,7 @@
> #include "SgiPlatform.h"
> #include "SgiAcpiHeader.h"
>
> -DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI",
> +DefinitionBlock ("DsdtTable.aml", "DSDT", 2, "ARMLTD", "ARMSGI",
> EFI_ACPI_ARM_OEM_REVISION) {
> Scope (_SB) {
> Device (CP00) { // Neoverse N2 core 0 diff --git
> a/Platform/ARM/SgiPkg/AcpiTables/RdV1/Dsdt.asl
> b/Platform/ARM/SgiPkg/AcpiTables/RdV1/Dsdt.asl
> index 7cc0614f4d60..f3e31e4085a3 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/RdV1/Dsdt.asl
> +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1/Dsdt.asl
> @@ -1,7 +1,7 @@
> /** @file
> * Differentiated System Description Table Fields (DSDT)
> *
> -* Copyright (c) 2020, Arm Ltd. All rights reserved.
> +* Copyright (c) 2020-2021, Arm Ltd. All rights reserved.
> *
> * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> @@ -10,7 +10,7 @@
> #include "SgiPlatform.h"
> #include "SgiAcpiHeader.h"
>
> -DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI",
> +DefinitionBlock ("DsdtTable.aml", "DSDT", 2, "ARMLTD", "ARMSGI",
> EFI_ACPI_ARM_OEM_REVISION) {
> Scope (_SB) {
> Device (CP00) { // Neoverse V1 core 0 diff --git
> a/Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Dsdt.asl
> b/Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Dsdt.asl
> index 9bf57d05a646..b1e88587080c 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Dsdt.asl
> +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1Mc/Dsdt.asl
> @@ -1,7 +1,7 @@
> /** @file
> * Differentiated System Description Table Fields (DSDT)
> *
> -* Copyright (c) 2020, Arm Limited. All rights reserved.
> +* Copyright (c) 2020-2021, Arm Limited. All rights reserved.
> *
> * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> @@ -10,7 +10,7 @@
> #include "SgiPlatform.h"
> #include "SgiAcpiHeader.h"
>
> -DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI",
> +DefinitionBlock ("DsdtTable.aml", "DSDT", 2, "ARMLTD", "ARMSGI",
> EFI_ACPI_ARM_OEM_REVISION) {
> Scope (_SB) {
>
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl
> b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl
> index bf0c964b7ae2..fe0b92137bde 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl
> +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl
> @@ -1,7 +1,7 @@
> /** @file
> * Differentiated System Description Table Fields (DSDT)
> *
> -* Copyright (c) 2018, ARM Ltd. All rights reserved.
> +* Copyright (c) 2018 - 2021, ARM Ltd. All rights reserved.
> *
> * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> @@ -10,7 +10,7 @@
> #include "SgiPlatform.h"
> #include "SgiAcpiHeader.h"
>
> -DefinitionBlock("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI",
> EFI_ACPI_ARM_OEM_REVISION) {
> +DefinitionBlock("DsdtTable.aml", "DSDT", 2, "ARMLTD", "ARMSGI",
> +EFI_ACPI_ARM_OEM_REVISION) {
> Scope(_SB) {
>
> Device(CP00) { // A75-0: Cluster 0, Cpu 0 diff --git
> a/Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl
> b/Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl
> index 49c630d53140..f02d5cea8b3c 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl
> +++ b/Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl
> @@ -1,7 +1,7 @@
> /** @file
> * Secondary System Description Table (SSDT)
> *
> -* Copyright (c) 2018, ARM Limited. All rights reserved.
> +* Copyright (c) 2018 - 2021, ARM Limited. All rights reserved.
> *
> * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> @@ -9,7 +9,7 @@
>
> #include "SgiAcpiHeader.h"
>
> -DefinitionBlock("SsdtPci.aml", "SSDT", 1, "ARMLTD", "ARMSGI",
> EFI_ACPI_ARM_OEM_REVISION) {
> +DefinitionBlock("SsdtPci.aml", "SSDT", 2, "ARMLTD", "ARMSGI",
> +EFI_ACPI_ARM_OEM_REVISION) {
> Scope (_SB) {
> // PCI Root Complex
> Device (PCI0) {
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl
> b/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl
> index 785f426fc29b..6b36da23cf0b 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl
> +++ b/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl
> @@ -1,7 +1,7 @@
> /** @file
> * Secondary System Description Table Fields (SSDT)
> *
> -* Copyright (c) 2020, Arm Ltd. All rights reserved.
> +* Copyright (c) 2020-2021, Arm Ltd. All rights reserved.
> *
> * SPDX-License-Identifier: BSD-2-Clause-Patent
> *
> @@ -10,7 +10,7 @@
> #include "SgiPlatform.h"
> #include "SgiAcpiHeader.h"
>
> -DefinitionBlock ("SsdtRosTable.aml", "SSDT", 1, "ARMLTD", "ARMSGI",
> +DefinitionBlock ("SsdtRosTable.aml", "SSDT", 2, "ARMLTD", "ARMSGI",
> EFI_ACPI_ARM_OEM_REVISION) {
> Scope (_SB) {
> // UART PL011
> --
> 2.17.1
>
>
>
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#70434): https://edk2.groups.io/g/devel/message/70434
> Mute This Topic: https://groups.io/mt/79708363/1779659
> Group Owner: devel+owner at edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub
> [sami.mujawar at arm.com]
> -=-=-=-=-=-=
>
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#70910): https://edk2.groups.io/g/devel/message/70910
Mute This Topic: https://groups.io/mt/79708363/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list