[edk2-devel] [RFC PATCH v1 11/20] DynamicTablesPkg: TableHelperLib: Populate OemTableId using ConfigManager

["Sunil V L" <sunilvl@ventanamicro.com>]

To support multiple CPU architectures/vendors, it is better to create
OemTableId using the platform provided value instead of default ARM.

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Pierre Gondois <pierre.gondois@arm.com>
Cc: Sami Mujawar <Sami.Mujawar@arm.com>
Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
---
 .../Common/TableHelperLib/TableHelper.c       | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c b/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c
index 549cee1b3fd5..219f94e0dbcc 100644
--- a/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c
+++ b/DynamicTablesPkg/Library/Common/TableHelperLib/TableHelper.c
@@ -161,20 +161,16 @@ AddAcpiHeader (
   CopyMem (AcpiHeader->OemId, CfgMfrInfo->OemId, sizeof (AcpiHeader->OemId));
 
   // UINT64  OemTableId
-  if (AcpiTableInfo->OemTableId != 0) {
-    AcpiHeader->OemTableId = AcpiTableInfo->OemTableId;
-  } else {
-    AcpiHeader->OemTableId = SIGNATURE_32 (
-                               CfgMfrInfo->OemId[0],
-                               CfgMfrInfo->OemId[1],
-                               CfgMfrInfo->OemId[2],
-                               CfgMfrInfo->OemId[3]
-                               ) |
-                             LShiftU64 (
-                               (UINT64)Generator->AcpiTableSignature,
-                               32
-                               );
-  }
+  AcpiHeader->OemTableId = SIGNATURE_32 (
+                             CfgMfrInfo->OemId[0],
+                             CfgMfrInfo->OemId[1],
+                             CfgMfrInfo->OemId[2],
+                             CfgMfrInfo->OemId[3]
+                             ) |
+                           LShiftU64 (
+                             (UINT64)Generator->AcpiTableSignature,
+                             32
+                             );
 
   // UINT32  OemRevision
   if (AcpiTableInfo->OemRevision != 0) {
-- 
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113473): https://edk2.groups.io/g/devel/message/113473
Mute This Topic: https://groups.io/mt/103622727/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-