* [edk2-platforms][PATCH V1 1/1] Platform/ARM/SgiPkg: Update ACPI Table revision @ 2021-01-15 17:57 Pranav Madhu 2021-01-19 16:53 ` [edk2-devel] " Thomas Abraham 2021-01-29 9:52 ` Sami Mujawar 0 siblings, 2 replies; 5+ messages in thread From: Pranav Madhu @ 2021-01-15 17:57 UTC (permalink / raw) To: devel; +Cc: Ard Biesheuvel, Leif Lindholm 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@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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [edk2-devel] [edk2-platforms][PATCH V1 1/1] Platform/ARM/SgiPkg: Update ACPI Table revision 2021-01-15 17:57 [edk2-platforms][PATCH V1 1/1] Platform/ARM/SgiPkg: Update ACPI Table revision Pranav Madhu @ 2021-01-19 16:53 ` Thomas Abraham 2021-01-29 9:52 ` Sami Mujawar 1 sibling, 0 replies; 5+ messages in thread From: Thomas Abraham @ 2021-01-19 16:53 UTC (permalink / raw) To: devel@edk2.groups.io, Pranav Madhu; +Cc: Ard Biesheuvel, Leif Lindholm, nd > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Pranav > Madhu via groups.io > Sent: Friday, January 15, 2021 11:28 PM > To: devel@edk2.groups.io > Cc: Ard Biesheuvel <Ard.Biesheuvel@arm.com>; Leif Lindholm > <leif@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@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(-) Reviewed-by: Thomas Abraham <thomas.abraham@arm.com> [...] IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [edk2-devel] [edk2-platforms][PATCH V1 1/1] Platform/ARM/SgiPkg: Update ACPI Table revision 2021-01-15 17:57 [edk2-platforms][PATCH V1 1/1] Platform/ARM/SgiPkg: Update ACPI Table revision Pranav Madhu 2021-01-19 16:53 ` [edk2-devel] " Thomas Abraham @ 2021-01-29 9:52 ` Sami Mujawar 2021-01-29 14:15 ` Samer El-Haj-Mahmoud 1 sibling, 1 reply; 5+ messages in thread From: Sami Mujawar @ 2021-01-29 9:52 UTC (permalink / raw) To: devel@edk2.groups.io, Pranav Madhu; +Cc: Ard Biesheuvel, Leif Lindholm, nd 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@arm.com> Regards, Sami Mujawar -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Pranav Madhu via groups.io Sent: 15 January 2021 05:58 PM To: devel@edk2.groups.io Cc: Ard Biesheuvel <Ard.Biesheuvel@arm.com>; Leif Lindholm <leif@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@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@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [sami.mujawar@arm.com] -=-=-=-=-=-= ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [edk2-devel] [edk2-platforms][PATCH V1 1/1] Platform/ARM/SgiPkg: Update ACPI Table revision 2021-01-29 9:52 ` Sami Mujawar @ 2021-01-29 14:15 ` Samer El-Haj-Mahmoud 0 siblings, 0 replies; 5+ messages in thread From: Samer El-Haj-Mahmoud @ 2021-01-29 14:15 UTC (permalink / raw) To: devel@edk2.groups.io, Sami Mujawar, Pranav Madhu Cc: ardb+tianocore@kernel.org, Leif Lindholm, nd, Samer El-Haj-Mahmoud 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@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sami > Mujawar via groups.io > Sent: Friday, January 29, 2021 4:52 AM > To: devel@edk2.groups.io; Pranav Madhu <Pranav.Madhu@arm.com> > Cc: Ard Biesheuvel <Ard.Biesheuvel@arm.com>; Leif Lindholm > <leif@nuviainc.com>; nd <nd@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@arm.com> > > Regards, > > Sami Mujawar > > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Pranav > Madhu via groups.io > Sent: 15 January 2021 05:58 PM > To: devel@edk2.groups.io > Cc: Ard Biesheuvel <Ard.Biesheuvel@arm.com>; Leif Lindholm > <leif@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@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@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub > [sami.mujawar@arm.com] > -=-=-=-=-=-= > > > > > > ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <165A798FD42477E4.3915@groups.io>]
* Re: [edk2-devel] [edk2-platforms][PATCH V1 1/1] Platform/ARM/SgiPkg: Update ACPI Table revision [not found] <165A798FD42477E4.3915@groups.io> @ 2021-01-29 6:42 ` Pranav Madhu 0 siblings, 0 replies; 5+ messages in thread From: Pranav Madhu @ 2021-01-29 6:42 UTC (permalink / raw) To: devel@edk2.groups.io, Pranav Madhu Cc: Ard Biesheuvel, Leif Lindholm, Thomas Abraham On Friday, January 15, 2021 11:28 PM, Pranav Madhu wrote: > 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@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(-) > Hi Ard, Leif, Could you please have a look at this patch and let me know if there are any comments. Thanks, Pranav [...] IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-01-29 14:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-15 17:57 [edk2-platforms][PATCH V1 1/1] Platform/ARM/SgiPkg: Update ACPI Table revision Pranav Madhu
2021-01-19 16:53 ` [edk2-devel] " Thomas Abraham
2021-01-29 9:52 ` Sami Mujawar
2021-01-29 14:15 ` Samer El-Haj-Mahmoud
[not found] <165A798FD42477E4.3915@groups.io>
2021-01-29 6:42 ` Pranav Madhu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox