From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.1385.1618252425553966426 for ; Mon, 12 Apr 2021 11:33:45 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: pranav.madhu@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2774C113E; Mon, 12 Apr 2021 11:33:45 -0700 (PDT) Received: from usa.arm.com (a074742.blr.arm.com [10.162.16.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B922E3F694; Mon, 12 Apr 2021 11:33:43 -0700 (PDT) From: "Pranav Madhu" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Samer El-Haj-Mahmoud , Sami Mujawar Subject: [edk2-platforms][PATCH V3 4/6] Platform/Sgi: update ACPI table revision Date: Tue, 13 Apr 2021 00:03:28 +0530 Message-Id: <20210412183330.5890-5-pranav.madhu@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210412183330.5890-1-pranav.madhu@arm.com> References: <20210412183330.5890-1-pranav.madhu@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 Reviewed-by: Sami Mujawar --- 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/SgiPk= g/SgiPlatform.dsc.inc index ed7c7d6c4581..12a8f8884c89 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 # @@ -106,6 +106,9 @@ gArmTokenSpaceGuid.PcdSystemMemoryBase|0x80000000 gArmTokenSpaceGuid.PcdSystemMemorySize|0x7F000000 =20 + # 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" =20 -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" =20 -DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI", +DefinitionBlock ("DsdtTable.aml", "DSDT", 2, "ARMLTD", "ARMSGI", EFI_ACPI_ARM_OEM_REVISION) { Scope (_SB) { =20 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" =20 -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" =20 -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/AR= M/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" =20 -DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI", +DefinitionBlock ("DsdtTable.aml", "DSDT", 2, "ARMLTD", "ARMSGI", EFI_ACPI_ARM_OEM_REVISION) { Scope (_SB) { =20 diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575/Dsdt.asl b/Platform/AR= M/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" =20 -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) { =20 Device(CP00) { // A75-0: Cluster 0, Cpu 0 diff --git a/Platform/ARM/SgiPkg/AcpiTables/Ssdt.asl b/Platform/ARM/SgiPk= g/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 @@ =20 #include "SgiAcpiHeader.h" =20 -DefinitionBlock("SsdtPci.aml", "SSDT", 1, "ARMLTD", "ARMSGI", EFI_ACPI_A= RM_OEM_REVISION) { +DefinitionBlock("SsdtPci.aml", "SSDT", 2, "ARMLTD", "ARMSGI", EFI_ACPI_A= RM_OEM_REVISION) { Scope (_SB) { // PCI Root Complex Device (PCI0) { diff --git a/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl b/Platform/ARM/Sg= iPkg/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" =20 -DefinitionBlock ("SsdtRosTable.aml", "SSDT", 1, "ARMLTD", "ARMSGI", +DefinitionBlock ("SsdtRosTable.aml", "SSDT", 2, "ARMLTD", "ARMSGI", EFI_ACPI_ARM_OEM_REVISION) { Scope (_SB) { // UART PL011 --=20 2.17.1