DynamicTablesPkg: Adds generic ACPI Creator ID

Adds generic creator id as DYNT.
Updates the common ACPI tables with generic CreatorId.

Cc: Sami Mujawar <Sami.Mujawar@arm.com>
Cc: Pierre Gondois <pierre.gondois@arm.com>
Signed-off-by: Abdul Lateef Attar <AbdulLateef.Attar@amd.com>

14 files changed, 19 insertions, 14 deletions

diff --git a/DynamicTablesPkg/Include/AcpiTableGenerator.h b/DynamicTablesPkg/Include/AcpiTableGenerator.h
index 761a5ec6d3..d4ad603e2b 100644
--- a/DynamicTablesPkg/Include/AcpiTableGenerator.h
+++ b/DynamicTablesPkg/Include/AcpiTableGenerator.h
@@ -160,9 +160,14 @@ typedef enum StdAcpiTableId {
             TableId                           \

             )

 

-/** The Creator ID for the ACPI tables generated using

+/** The generic creator ID for the ACPI tables generated using

   the standard ACPI table generators.

 */

+#define TABLE_GENERATOR_CREATOR_ID  SIGNATURE_32('D', 'Y', 'N', 'T')

+

+/** The Creator ID for the ACPI tables generated using

+  the standard ACPI table generators for ARM.

+*/

 #define TABLE_GENERATOR_CREATOR_ID_ARM  SIGNATURE_32('A', 'R', 'M', 'H')

 

 /** A macro to initialise the common header part of EFI ACPI tables as

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/Dbg2Generator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/Dbg2Generator.c
index 6f49e6a270..f387319f14 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/Dbg2Generator.c
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/Dbg2Generator.c
@@ -534,7 +534,7 @@ ACPI_TABLE_GENERATOR  Dbg2Generator = {
   // Minimum supported ACPI Table Revision

   EFI_ACPI_DBG2_DEBUG_DEVICE_INFORMATION_STRUCT_REVISION,

   // Creator ID

-  TABLE_GENERATOR_CREATOR_ID_ARM,

+  TABLE_GENERATOR_CREATOR_ID,

   // Creator Revision

   DBG2_GENERATOR_REVISION,

   // Build table function. Use the extended version instead.

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/FadtGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/FadtGenerator.c
index c2140ef414..3ba3fc230b 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/FadtGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/FadtGenerator.c
@@ -582,7 +582,7 @@ ACPI_TABLE_GENERATOR  FadtGenerator = {
   // Minimum supported ACPI Table Revision

   EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE_REVISION,

   // Creator ID

-  TABLE_GENERATOR_CREATOR_ID_ARM,

+  TABLE_GENERATOR_CREATOR_ID,

   // Creator Revision

   FADT_GENERATOR_REVISION,

   // Build Table function

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/McfgGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/McfgGenerator.c
index 40dea304e3..79a2f598f9 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/McfgGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/McfgGenerator.c
@@ -306,7 +306,7 @@ ACPI_TABLE_GENERATOR  McfgGenerator = {
   // Minimum supported ACPI Table Revision

   EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_REVISION,

   // Creator ID

-  TABLE_GENERATOR_CREATOR_ID_ARM,

+  TABLE_GENERATOR_CREATOR_ID,

   // Creator Revision

   MCFG_GENERATOR_REVISION,

   // Build Table function

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/PcctGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/PcctGenerator.c
index 36e6807023..e362254a3c 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/PcctGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/PcctGenerator.c
@@ -1121,7 +1121,7 @@ ACPI_PCCT_GENERATOR  PcctGenerator = {
     // Minimum ACPI Table Revision supported by this Generator

     EFI_ACPI_6_4_PLATFORM_COMMUNICATION_CHANNEL_TABLE_REVISION,

     // Creator ID

-    TABLE_GENERATOR_CREATOR_ID_ARM,

+    TABLE_GENERATOR_CREATOR_ID,

     // Creator Revision

     PCCT_GENERATOR_REVISION,

     // Build Table function

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/PpttGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/PpttGenerator.c
index fd465cbab0..8e2e1f61ab 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/PpttGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/PpttGenerator.c
@@ -1403,7 +1403,7 @@ ACPI_PPTT_GENERATOR  PpttGenerator = {
     // Minimum supported ACPI Table Revision

     EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_REVISION,

     // Creator ID

-    TABLE_GENERATOR_CREATOR_ID_ARM,

+    TABLE_GENERATOR_CREATOR_ID,

     // Creator Revision

     PPTT_GENERATOR_REVISION,

     // Build Table function

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiRawLib/RawGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiRawLib/RawGenerator.c
index a8323ad4ea..a4f1cfb0d7 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiRawLib/RawGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiRawLib/RawGenerator.c
@@ -81,7 +81,7 @@ ACPI_TABLE_GENERATOR  RawGenerator = {
   // Minimum ACPI Table Revision - Unused

   0,

   // Creator ID

-  TABLE_GENERATOR_CREATOR_ID_ARM,

+  TABLE_GENERATOR_CREATOR_ID,

   // Creator Revision

   RAW_GENERATOR_REVISION,

   // Build Table function

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/SpcrGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/SpcrGenerator.c
index 065729d7ee..ddd8262f38 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/SpcrGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/SpcrGenerator.c
@@ -419,7 +419,7 @@ ACPI_TABLE_GENERATOR  SpcrGenerator = {
   // Minimum supported ACPI Table Revision

   EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_REVISION,

   // Creator ID

-  TABLE_GENERATOR_CREATOR_ID_ARM,

+  TABLE_GENERATOR_CREATOR_ID,

   // Creator Revision

   SPCR_GENERATOR_REVISION,

   // Build table function. Use the extended version instead.

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/SratGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/SratGenerator.c
index 1a9434e6bd..20e1a4bfd3 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/SratGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/SratGenerator.c
@@ -599,7 +599,7 @@ ACPI_TABLE_GENERATOR  SratGenerator = {
   // Minimum supported ACPI Table Revision

   EFI_ACPI_6_3_SYSTEM_RESOURCE_AFFINITY_TABLE_REVISION,

   // Creator ID

-  TABLE_GENERATOR_CREATOR_ID_ARM,

+  TABLE_GENERATOR_CREATOR_ID,

   // Creator Revision

   SRAT_GENERATOR_REVISION,

   // Build Table function

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyGenerator.c
index 24b06d01dc..3bb0c2fe25 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyGenerator.c
@@ -1359,7 +1359,7 @@ ACPI_CPU_TOPOLOGY_GENERATOR  SsdtCpuTopologyGenerator = {
     // Minimum ACPI Table Revision - Unused

     0,

     // Creator ID

-    TABLE_GENERATOR_CREATOR_ID_ARM,

+    TABLE_GENERATOR_CREATOR_ID,

     // Creator Revision

     SSDT_CPU_TOPOLOGY_GENERATOR_REVISION,

     // Build Table function

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieGenerator.c
index 618056e85a..7fe780d27e 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieGenerator.c
@@ -1168,7 +1168,7 @@ ACPI_PCI_GENERATOR  SsdtPcieGenerator = {
     // Minimum ACPI Table Revision - Unused

     0,

     // Creator ID

-    TABLE_GENERATOR_CREATOR_ID_ARM,

+    TABLE_GENERATOR_CREATOR_ID,

     // Creator Revision

     SSDT_PCI_GENERATOR_REVISION,

     // Build table function. Use the extended version instead.

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/SsdtSerialPortGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/SsdtSerialPortGenerator.c
index 671ba05740..bbd8b65db9 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/SsdtSerialPortGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/SsdtSerialPortGenerator.c
@@ -301,7 +301,7 @@ ACPI_TABLE_GENERATOR  SsdtSerialPortGenerator = {
   // Minimum ACPI Table Revision - Unused

   0,

   // Creator ID

-  TABLE_GENERATOR_CREATOR_ID_ARM,

+  TABLE_GENERATOR_CREATOR_ID,

   // Creator Revision

   SSDT_SERIAL_GENERATOR_REVISION,

   // Build table function. Use the extended version instead.

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiTpm2Lib/Tpm2Generator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiTpm2Lib/Tpm2Generator.c
index 93dca5e564..7255c933d3 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiTpm2Lib/Tpm2Generator.c
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiTpm2Lib/Tpm2Generator.c
@@ -341,7 +341,7 @@ ACPI_TABLE_GENERATOR  Tpm2Generator = {
   // Minimum supported ACPI Table Revision

   EFI_TPM2_ACPI_TABLE_REVISION_4,

   // Creator ID

-  TABLE_GENERATOR_CREATOR_ID_ARM,

+  TABLE_GENERATOR_CREATOR_ID,

   // Creator Revision

   TPM2_GENERATOR_REVISION,

   // Build Table function

diff --git a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c
index f433a461b2..35ec2aaa67 100644
--- a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c
+++ b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c
@@ -116,7 +116,7 @@ AmlCodeGenDefinitionBlock (
   CopyMem (&AcpiHeader.OemId, OemId, 6);

   CopyMem (&AcpiHeader.OemTableId, OemTableId, 8);

   AcpiHeader.OemRevision     = OemRevision;

-  AcpiHeader.CreatorId       = TABLE_GENERATOR_CREATOR_ID_ARM;

+  AcpiHeader.CreatorId       = TABLE_GENERATOR_CREATOR_ID;

   AcpiHeader.CreatorRevision = CREATE_REVISION (1, 0);

 

   Status = AmlCreateRootNode (&AcpiHeader, NewRootNode);