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>

diff --git a/DynamicTablesPkg/Include/AcpiTableGenerator.h b/DynamicTablesPkg/Include/AcpiTableGenerator.h
index 761a5ec6d36849a93206ee11fba66fb9072eeba1..d4ad603e2b856a01ca24e3693a10a745ddcb9f60 100644 (file)
--- a/DynamicTablesPkg/Include/AcpiTableGenerator.h
+++ b/DynamicTablesPkg/Include/AcpiTableGenerator.h
@@ -160,9 +160,14 @@ typedef enum StdAcpiTableId {
             TableId                           \\r
             )\r
 \r
-/** The Creator ID for the ACPI tables generated using\r
+/** The generic creator ID for the ACPI tables generated using\r
   the standard ACPI table generators.\r
 */\r
+#define TABLE_GENERATOR_CREATOR_ID  SIGNATURE_32('D', 'Y', 'N', 'T')\r
+\r
+/** The Creator ID for the ACPI tables generated using\r
+  the standard ACPI table generators for ARM.\r
+*/\r
 #define TABLE_GENERATOR_CREATOR_ID_ARM  SIGNATURE_32('A', 'R', 'M', 'H')\r
 \r
 /** A macro to initialise the common header part of EFI ACPI tables as\r

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/Dbg2Generator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/Dbg2Generator.c
index 6f49e6a27053c32c94d58db4347bbdc7342e21d5..f387319f1475f980dac07a2dfbedc1ace8fdebf3 100644 (file)
--- 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\r
   EFI_ACPI_DBG2_DEBUG_DEVICE_INFORMATION_STRUCT_REVISION,\r
   // Creator ID\r
-  TABLE_GENERATOR_CREATOR_ID_ARM,\r
+  TABLE_GENERATOR_CREATOR_ID,\r
   // Creator Revision\r
   DBG2_GENERATOR_REVISION,\r
   // Build table function. Use the extended version instead.\r

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/FadtGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/FadtGenerator.c
index c2140ef414d2af8fd9e0bd7161b3a67ca3261d77..3ba3fc230b6c2dc6e9f97d6e0391401e629a1222 100644 (file)
--- 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\r
   EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE_REVISION,\r
   // Creator ID\r
-  TABLE_GENERATOR_CREATOR_ID_ARM,\r
+  TABLE_GENERATOR_CREATOR_ID,\r
   // Creator Revision\r
   FADT_GENERATOR_REVISION,\r
   // Build Table function\r

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/McfgGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/McfgGenerator.c
index 40dea304e301d648c91f50062b2322008f3bcebb..79a2f598f94212ee732269678c6fd9f7595acb18 100644 (file)
--- 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\r
   EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_REVISION,\r
   // Creator ID\r
-  TABLE_GENERATOR_CREATOR_ID_ARM,\r
+  TABLE_GENERATOR_CREATOR_ID,\r
   // Creator Revision\r
   MCFG_GENERATOR_REVISION,\r
   // Build Table function\r

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/PcctGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/PcctGenerator.c
index 36e6807023fbc2c1fc76a5c854839bac19b8c2da..e362254a3cb46151e14bd0c1e6e34ea1de288e26 100644 (file)
--- 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\r
     EFI_ACPI_6_4_PLATFORM_COMMUNICATION_CHANNEL_TABLE_REVISION,\r
     // Creator ID\r
-    TABLE_GENERATOR_CREATOR_ID_ARM,\r
+    TABLE_GENERATOR_CREATOR_ID,\r
     // Creator Revision\r
     PCCT_GENERATOR_REVISION,\r
     // Build Table function\r

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/PpttGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/PpttGenerator.c
index fd465cbab0e9e45dfee9d4e9d573e6e89c465e98..8e2e1f61ab1f5951c5cd520fce7cccbe95ae1f85 100644 (file)
--- 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\r
     EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_REVISION,\r
     // Creator ID\r
-    TABLE_GENERATOR_CREATOR_ID_ARM,\r
+    TABLE_GENERATOR_CREATOR_ID,\r
     // Creator Revision\r
     PPTT_GENERATOR_REVISION,\r
     // Build Table function\r

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiRawLib/RawGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiRawLib/RawGenerator.c
index a8323ad4ea03044da61b3a512fc975e89fe0ae49..a4f1cfb0d774198bf29e044d22f89a9294a5ac3c 100644 (file)
--- 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\r
   0,\r
   // Creator ID\r
-  TABLE_GENERATOR_CREATOR_ID_ARM,\r
+  TABLE_GENERATOR_CREATOR_ID,\r
   // Creator Revision\r
   RAW_GENERATOR_REVISION,\r
   // Build Table function\r

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/SpcrGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/SpcrGenerator.c
index 065729d7eecfc5eef7a925d43a2f2995467d012c..ddd8262f3824286b6c960b58fc04eb724adead34 100644 (file)
--- 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\r
   EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_REVISION,\r
   // Creator ID\r
-  TABLE_GENERATOR_CREATOR_ID_ARM,\r
+  TABLE_GENERATOR_CREATOR_ID,\r
   // Creator Revision\r
   SPCR_GENERATOR_REVISION,\r
   // Build table function. Use the extended version instead.\r

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/SratGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/SratGenerator.c
index 1a9434e6bd08b329dd2a9f04559d6019279a833c..20e1a4bfd358d740afce286098147459be287b76 100644 (file)
--- 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\r
   EFI_ACPI_6_3_SYSTEM_RESOURCE_AFFINITY_TABLE_REVISION,\r
   // Creator ID\r
-  TABLE_GENERATOR_CREATOR_ID_ARM,\r
+  TABLE_GENERATOR_CREATOR_ID,\r
   // Creator Revision\r
   SRAT_GENERATOR_REVISION,\r
   // Build Table function\r

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyGenerator.c
index 24b06d01dc4d8caad6bd43ea62913c467bac2887..3bb0c2fe25a8d3409611fdc47c6b397a2e722675 100644 (file)
--- 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\r
     0,\r
     // Creator ID\r
-    TABLE_GENERATOR_CREATOR_ID_ARM,\r
+    TABLE_GENERATOR_CREATOR_ID,\r
     // Creator Revision\r
     SSDT_CPU_TOPOLOGY_GENERATOR_REVISION,\r
     // Build Table function\r

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieGenerator.c
index 618056e85a2af1ea5b4acdce5462cf5a9cfd8ddb..7fe780d27ea36b02e5889e5edd3342b04fb5d3b8 100644 (file)
--- 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\r
     0,\r
     // Creator ID\r
-    TABLE_GENERATOR_CREATOR_ID_ARM,\r
+    TABLE_GENERATOR_CREATOR_ID,\r
     // Creator Revision\r
     SSDT_PCI_GENERATOR_REVISION,\r
     // Build table function. Use the extended version instead.\r

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/SsdtSerialPortGenerator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/SsdtSerialPortGenerator.c
index 671ba057400ae158cc359e0ab50c8fe92f00d6c3..bbd8b65db92a1ea233b0e17f543a90d7c6406f91 100644 (file)
--- 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\r
   0,\r
   // Creator ID\r
-  TABLE_GENERATOR_CREATOR_ID_ARM,\r
+  TABLE_GENERATOR_CREATOR_ID,\r
   // Creator Revision\r
   SSDT_SERIAL_GENERATOR_REVISION,\r
   // Build table function. Use the extended version instead.\r

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiTpm2Lib/Tpm2Generator.c b/DynamicTablesPkg/Library/Acpi/Common/AcpiTpm2Lib/Tpm2Generator.c
index 93dca5e56417e9b2a677d65e9fb7e74d7402b30a..7255c933d3b12073d657829422c5a1b78a716546 100644 (file)
--- 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\r
   EFI_TPM2_ACPI_TABLE_REVISION_4,\r
   // Creator ID\r
-  TABLE_GENERATOR_CREATOR_ID_ARM,\r
+  TABLE_GENERATOR_CREATOR_ID,\r
   // Creator Revision\r
   TPM2_GENERATOR_REVISION,\r
   // Build Table function\r

diff --git a/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c b/DynamicTablesPkg/Library/Common/AmlLib/CodeGen/AmlCodeGen.c
index f433a461b24f32e4d38b042e9241abb7dca1de66..35ec2aaa6703d884cd7de4f07caf039cbd1e353d 100644 (file)
--- 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);\r
   CopyMem (&AcpiHeader.OemTableId, OemTableId, 8);\r
   AcpiHeader.OemRevision     = OemRevision;\r
-  AcpiHeader.CreatorId       = TABLE_GENERATOR_CREATOR_ID_ARM;\r
+  AcpiHeader.CreatorId       = TABLE_GENERATOR_CREATOR_ID;\r
   AcpiHeader.CreatorRevision = CREATE_REVISION (1, 0);\r
 \r
   Status = AmlCreateRootNode (&AcpiHeader, NewRootNode);\r