DynamicTablesPkg: Adds X64 support to SRAT table generator

Adds X64 support to the SRAT table generator library.
Adds EX64ObjLocalApicX2ApicAffinity CM object to get
platform configuration information.
Update the parser with newly added CM object.

Cc: Sami Mujawar <[email protected]>
Cc: Pierre Gondois <[email protected]>
Signed-off-by: Abdul Lateef Attar <[email protected]>

Author: Abdul Lateef Attar

DynamicTablesPkg/DynamicTables.dsc.inc

@@ -71,6 +71,7 @@
       # Generators
       #   Common
       NULL|DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/AcpiFadtLib.inf
+      NULL|DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/AcpiSratLib.inf
       NULL|DynamicTablesPkg/Library/Acpi/Common/AcpiSpmiLib/AcpiSpmiLib.inf
       #   X64 specific
       NULL|DynamicTablesPkg/Library/Acpi/X64/AcpiFacsLib/AcpiFacsLib.inf

DynamicTablesPkg/DynamicTablesPkg.ci.yaml

@@ -2,7 +2,7 @@
 # CI configuration for DynamicTablesPkg
 #
 # Copyright (c) 2020, Arm Limited. All rights reserved.<BR>
-# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.<BR>
+# Copyright (C) 2024 - 2025 Advanced Micro Devices, Inc. All rights reserved.<BR>
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
 {
@@ -123,6 +123,7 @@
            "Rdword",
            "Roadmap",
            "ROOTNODEBASE",
+           "sapic",
            "ssdtcmn",
            "ssdtserialporttemplate",
            "SMMUV",

DynamicTablesPkg/Include/X64NameSpaceObjects.h

@@ -33,25 +33,26 @@ typedef enum {
     in the X64 Namespace
 */
 typedef enum X64ObjectID {
-  EX64ObjReserved,               ///<  0 - Reserved
-  EX64ObjFadtSciInterrupt,       ///<  1 - FADT SCI Interrupt information
-  EX64ObjFadtSciCmdInfo,         ///<  2 - FADT SCI CMD information
-  EX64ObjFadtPmBlockInfo,        ///<  3 - FADT Power management block info
-  EX64ObjFadtGpeBlockInfo,       ///<  4 - FADT GPE block info
-  EX64ObjFadtXpmBlockInfo,       ///<  5 - FADT 64-bit Power Management block info
-  EX64ObjFadtXgpeBlockInfo,      ///<  6 - FADT 64-bit GPE block info
-  EX64ObjFadtSleepBlockInfo,     ///<  7 - FADT Sleep block info
-  EX64ObjFadtResetBlockInfo,     ///<  8 - FADT Reset block info
-  EX64ObjFadtMiscInfo,           ///<  9 - FADT Legacy fields info
-  EX64ObjWsmtFlagsInfo,          ///< 10 - WSMT protection flags info
-  EX64ObjHpetInfo,               ///< 11 - HPET device info
-  EX64ObjMadtInfo,               ///< 12 - MADT info
-  EX64ObjLocalApicX2ApicInfo,    ///< 13 - Local APIC and X2APIC info
-  EX64ObjIoApicInfo,             ///< 14 - IO APIC info
-  EX64ObjIntrSourceOverrideInfo, ///< 15 - Interrupt Source Override info
-  EX64ObjLocalApicX2ApicNmiInfo, ///< 16 - Local APIC and X2APIC NMI info
-  EX64ObjFacsInfo,               ///< 17 - FACS info
-  EX64ObjMax                     ///< 18 - Maximum Object ID
+  EX64ObjReserved,                    ///<  0 - Reserved
+  EX64ObjFadtSciInterrupt,            ///<  1 - FADT SCI Interrupt information
+  EX64ObjFadtSciCmdInfo,              ///<  2 - FADT SCI CMD information
+  EX64ObjFadtPmBlockInfo,             ///<  3 - FADT Power management block info
+  EX64ObjFadtGpeBlockInfo,            ///<  4 - FADT GPE block info
+  EX64ObjFadtXpmBlockInfo,            ///<  5 - FADT 64-bit Power Management block info
+  EX64ObjFadtXgpeBlockInfo,           ///<  6 - FADT 64-bit GPE block info
+  EX64ObjFadtSleepBlockInfo,          ///<  7 - FADT Sleep block info
+  EX64ObjFadtResetBlockInfo,          ///<  8 - FADT Reset block info
+  EX64ObjFadtMiscInfo,                ///<  9 - FADT Legacy fields info
+  EX64ObjWsmtFlagsInfo,               ///< 10 - WSMT protection flags info
+  EX64ObjHpetInfo,                    ///< 11 - HPET device info
+  EX64ObjMadtInfo,                    ///< 12 - MADT info
+  EX64ObjLocalApicX2ApicInfo,         ///< 13 - Local APIC and X2APIC info
+  EX64ObjIoApicInfo,                  ///< 14 - IO APIC info
+  EX64ObjIntrSourceOverrideInfo,      ///< 15 - Interrupt Source Override info
+  EX64ObjLocalApicX2ApicNmiInfo,      ///< 16 - Local APIC and X2APIC NMI info
+  EX64ObjFacsInfo,                    ///< 17 - FACS info
+  EX64ObjLocalApicX2ApicAffinityInfo, ///< 18 - Local APIC and X2APIC Affinity info
+  EX64ObjMax                          ///< 19 - Maximum Object ID
 } EX64_OBJECT_ID;
 
 /** A structure that describes the
@@ -278,5 +279,18 @@ typedef struct CmX64FacsInfo {
   UINT32    OspmFlags;
 } CM_X64_FACS_INFO;
 
+/**
+  A structure that describes the Local APIC and X2APIC Affinity information.
+
+  ID: EX64ObjLocalApicX2ApicAffinityInfo
+ */
+typedef struct CmX64LocalApicX2ApicAffinityInfo {
+  LOCAL_APIC_MODE    ApicMode;
+  UINT32             ApicId;
+  UINT32             ProximityDomain;
+  UINT32             Flags;
+  UINT32             ClockDomain;
+} CM_X64_LOCAL_APIC_X2APIC_AFFINITY_INFO;
+
 #pragma pack()
 #endif // X64_NAMESPACE_OBJECTS_H_

DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/AcpiSratLib.inf

@@ -2,6 +2,7 @@
 #  SRAT Table Generator
 #
 #  Copyright (c) 2019, ARM Limited. All rights reserved.
+#  Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
@@ -24,7 +25,7 @@
   Arm/ArmSratGenerator.c
 
 [Sources.IA32, Sources.X64]
-  SratGeneratorNull.c
+  X64/X64SratGenerator.c
 
 [Packages]
   EmbeddedPkg/EmbeddedPkg.dec

DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/SratGenerator.c

@@ -2,6 +2,8 @@
   SRAT Table Generator
 
   Copyright (c) 2019 - 2020, Arm Limited. All rights reserved.
+  Copyright (C) 2025 Advanced Micro Devices, Inc. All rights reserved.
+
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @par Reference(s):
@@ -140,9 +142,9 @@ AddMemoryAffinity (
     MemAff->ProximityDomain = MemAffInfo->ProximityDomain;
     MemAff->Reserved1       = EFI_ACPI_RESERVED_WORD;
     MemAff->AddressBaseLow  = (UINT32)(MemAffInfo->BaseAddress & MAX_UINT32);
-    MemAff->AddressBaseHigh = (UINT32)(MemAffInfo->BaseAddress >> 32);
+    MemAff->AddressBaseHigh = (UINT32)RShiftU64 (MemAffInfo->BaseAddress, 32);
     MemAff->LengthLow       = (UINT32)(MemAffInfo->Length & MAX_UINT32);
-    MemAff->LengthHigh      = (UINT32)(MemAffInfo->Length >> 32);
+    MemAff->LengthHigh      = (UINT32)RShiftU64 (MemAffInfo->Length, 32);
     MemAff->Reserved2       = EFI_ACPI_RESERVED_DWORD;
     MemAff->Flags           = MemAffInfo->Flags;
     MemAff->Reserved3       = EFI_ACPI_RESERVED_QWORD;