Platform/Sgi: 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>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

9 files changed, 20 insertions, 17 deletions

diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl
index d66c7cbf..04fd3bd0 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 cb05eed3..d9bac338 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 8688fd8d..42cb8655 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 7cc0614f..f3e31e40 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 9bf57d05..b1e88587 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 bf0c964b..fe0b9213 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 49c630d5..f02d5cea 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 785f426f..6b36da23 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

diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
index ed7c7d6c..12a8f888 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

 

+  # ACPI Table Version

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiExposedTableVersions|0x20

+

   #

   # PCIe

   #