From: Sami Mujawar <sami.muja...@arm.com>
Move the Memory Affinity Info object from Arm Namespace to the
Arch Common namespace.
Correspondingly also update the following modules to reflect the
changes introduced by the move:
- SRAT generator
- ConfigurationManagerObjectParser
- Dynamic Plat Repo TokenFixer map.
Cc: Pierre Gondois <pierre.gond...@arm.com>
Cc: Yeo Reum Yun <yeoreum....@arm.com>
Cc: AbdulLateef Attar <abdullateef.at...@amd.com>
Cc: Jeshua Smith <jesh...@nvidia.com>
Cc: Jeff Brasen <jbra...@nvidia.com>
Cc: Girish Mahadevan <gmahade...@nvidia.com>
Cc: Leif Lindholm <quic_llind...@quicinc.com>
Cc: Meenakshi Aggarwal <meenakshi.aggar...@nxp.com>
Signed-off-by: Sami Mujawar <sami.muja...@arm.com>
Signed-off-by: Pierre Gondois <pierre.gond...@arm.com>
---
.../Include/ArchCommonNameSpaceObjects.h | 19 +++++++
.../Include/ArmNameSpaceObjects.h | 51 ++++++-------------
.../Acpi/Arm/AcpiSratLibArm/SratGenerator.c | 14 ++---
.../DynamicPlatRepoLib/CmObjectTokenFixer.c | 31 ++++++-----
.../ConfigurationManagerObjectParser.c | 6 +--
DynamicTablesPkg/Readme.md | 34 ++++++-------
6 files changed, 77 insertions(+), 78 deletions(-)
diff --git a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h
b/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h
index 429505b6509a..86d751bdfaaa 100644
--- a/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h
+++ b/DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h
@@ -31,6 +31,7 @@ typedef enum ArchCommonObjectID {
EArchCommonObjPciConfigSpaceInfo, ///< 8 - PCI Configuration
Space Info
EArchCommonObjPciAddressMapInfo, ///< 9 - Pci Address Map Info
EArchCommonObjPciInterruptMapInfo, ///< 10 - Pci Interrupt Map
Info
+ EArchCommonObjMemoryAffinityInfo, ///< 11 - Memory Affinity Info
EArchCommonObjMax
} EARCH_COMMON_OBJECT_ID;
@@ -223,6 +224,24 @@ typedef struct CmArchCommonPciInterruptMapInfo {
CM_ARCH_COMMON_GENERIC_INTERRUPT IntcInterrupt;
} CM_ARCH_COMMON_PCI_INTERRUPT_MAP_INFO;
+/** A structure that describes the Memory Affinity Structure (Type 1) in SRAT
+
+ ID: EArchCommonObjMemoryAffinityInfo
+*/
+typedef struct CmArchCommonMemoryAffinityInfo {
+ /// The proximity domain to which the "range of memory" belongs.
+ UINT32 ProximityDomain;
+
+ /// Base Address
+ UINT64 BaseAddress;
+
+ /// Length
+ UINT64 Length;
+
+ /// Flags
+ UINT32 Flags;
+} CM_ARCH_COMMON_MEMORY_AFFINITY_INFO;
+
#pragma pack()
#endif // ARCH_COMMON_NAMESPACE_OBJECTS_H_
diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
index 5d7c84f51df6..7905152114a7 100644
--- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
+++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h
@@ -50,23 +50,22 @@ typedef enum ArmObjectID {
EArmObjSmmuInterruptArray, ///< 19 - SMMU
Interrupt Array
EArmObjProcHierarchyInfo, ///< 20 -
Processor Hierarchy Info
EArmObjCacheInfo, ///< 21 - Cache
Info
- EArmObjMemoryAffinityInfo, ///< 22 -
Memory Affinity Info
- EArmObjDeviceHandleAcpi, ///< 23 -
Device Handle Acpi
- EArmObjDeviceHandlePci, ///< 24 -
Device Handle Pci
- EArmObjGenericInitiatorAffinityInfo, ///< 25 -
Generic Initiator Affinity
- EArmObjCmn600Info, ///< 26 -
CMN-600 Info
- EArmObjLpiInfo, ///< 27 - Lpi
Info
- EArmObjRmr, ///< 28 -
Reserved Memory Range Node
- EArmObjMemoryRangeDescriptor, ///< 29 -
Memory Range Descriptor
- EArmObjCpcInfo, ///< 30 -
Continuous Performance Control Info
- EArmObjPccSubspaceType0Info, ///< 31 - Pcc
Subspace Type 0 Info
- EArmObjPccSubspaceType1Info, ///< 32 - Pcc
Subspace Type 2 Info
- EArmObjPccSubspaceType2Info, ///< 33 - Pcc
Subspace Type 2 Info
- EArmObjPccSubspaceType3Info, ///< 34 - Pcc
Subspace Type 3 Info
- EArmObjPccSubspaceType4Info, ///< 35 - Pcc
Subspace Type 4 Info
- EArmObjPccSubspaceType5Info, ///< 36 - Pcc
Subspace Type 5 Info
- EArmObjEtInfo, ///< 37 -
Embedded Trace Extension/Module Info
- EArmObjPsdInfo, ///< 38 -
P-State Dependency (PSD) Info
+ EArmObjDeviceHandleAcpi, ///< 22 -
Device Handle Acpi
+ EArmObjDeviceHandlePci, ///< 23 -
Device Handle Pci
+ EArmObjGenericInitiatorAffinityInfo, ///< 24 -
Generic Initiator Affinity
+ EArmObjCmn600Info, ///< 25 -
CMN-600 Info
+ EArmObjLpiInfo, ///< 26 - Lpi
Info
+ EArmObjRmr, ///< 27 -
Reserved Memory Range Node
+ EArmObjMemoryRangeDescriptor, ///< 28 -
Memory Range Descriptor
+ EArmObjCpcInfo, ///< 29 -
Continuous Performance Control Info
+ EArmObjPccSubspaceType0Info, ///< 30 - Pcc
Subspace Type 0 Info
+ EArmObjPccSubspaceType1Info, ///< 31 - Pcc
Subspace Type 2 Info
+ EArmObjPccSubspaceType2Info, ///< 32 - Pcc
Subspace Type 2 Info
+ EArmObjPccSubspaceType3Info, ///< 33 - Pcc
Subspace Type 3 Info
+ EArmObjPccSubspaceType4Info, ///< 34 - Pcc
Subspace Type 4 Info
+ EArmObjPccSubspaceType5Info, ///< 35 - Pcc
Subspace Type 5 Info
+ EArmObjEtInfo, ///< 36 -
Embedded Trace Extension/Module Info
+ EArmObjPsdInfo, ///< 37 -
P-State Dependency (PSD) Info
EArmObjMax
} EARM_OBJECT_ID;
@@ -721,24 +720,6 @@ typedef struct CmArmCacheInfo {
UINT32 CacheId;
} CM_ARM_CACHE_INFO;
-/** A structure that describes the Memory Affinity Structure (Type 1) in SRAT
-
- ID: EArmObjMemoryAffinityInfo
-*/
-typedef struct CmArmMemoryAffinityInfo {
- /// The proximity domain to which the "range of memory" belongs.
- UINT32 ProximityDomain;
-
- /// Base Address
- UINT64 BaseAddress;
-
- /// Length
- UINT64 Length;
-
- /// Flags
- UINT32 Flags;
-} CM_ARM_MEMORY_AFFINITY_INFO;
-
/** A structure that describes the ACPI Device Handle (Type 0) in the
Generic Initiator Affinity structure in SRAT
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSratLibArm/SratGenerator.c
b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSratLibArm/SratGenerator.c
index 431995ed3884..3ba2448f2384 100644
--- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSratLibArm/SratGenerator.c
+++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSratLibArm/SratGenerator.c
@@ -32,7 +32,7 @@
The following Configuration Manager Object(s) are used by this Generator:
- EArmObjGicCInfo (REQUIRED)
- EArmObjGicItsInfo (OPTIONAL)
- - EArmObjMemoryAffinityInfo (OPTIONAL)
+ - EArchCommonObjMemoryAffinityInfo (OPTIONAL)
- EArmObjGenericInitiatorAffinityInfo (OPTIONAL)
- EArmObjDeviceHandleAcpi (OPTIONAL)
- EArmObjDeviceHandlePci (OPTIONAL)
@@ -62,9 +62,9 @@ GET_OBJECT_LIST (
information from the Configuration Manager.
*/
GET_OBJECT_LIST (
- EObjNameSpaceArm,
- EArmObjMemoryAffinityInfo,
- CM_ARM_MEMORY_AFFINITY_INFO
+ EObjNameSpaceArchCommon,
+ EArchCommonObjMemoryAffinityInfo,
+ CM_ARCH_COMMON_MEMORY_AFFINITY_INFO
);
/**
@@ -235,7 +235,7 @@ AddMemoryAffinity (
IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,
IN EFI_ACPI_6_3_SYSTEM_RESOURCE_AFFINITY_TABLE_HEADER *CONST Srat,
IN CONST UINT32 MemAffOffset,
- IN CONST CM_ARM_MEMORY_AFFINITY_INFO *MemAffInfo,
+ IN CONST CM_ARCH_COMMON_MEMORY_AFFINITY_INFO *MemAffInfo,
IN UINT32 MemAffCount
)
{
@@ -467,7 +467,7 @@ BuildSratTable (
CM_ARM_GICC_INFO *GicCInfo;
CM_ARM_GIC_ITS_INFO *GicItsInfo;
- CM_ARM_MEMORY_AFFINITY_INFO *MemAffInfo;
+ CM_ARCH_COMMON_MEMORY_AFFINITY_INFO *MemAffInfo;
CM_ARM_GENERIC_INITIATOR_AFFINITY_INFO *GenInitiatorAffInfo;
EFI_ACPI_6_3_SYSTEM_RESOURCE_AFFINITY_TABLE_HEADER *Srat;
@@ -537,7 +537,7 @@ BuildSratTable (
goto error_handler;
}
- Status = GetEArmObjMemoryAffinityInfo (
+ Status = GetEArchCommonObjMemoryAffinityInfo (
CfgMgrProtocol,
CM_NULL_TOKEN,
&MemAffInfo,
diff --git
a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
index 4d660265cfe3..654686a0125a 100644
--- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
+++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
@@ -165,23 +165,22 @@ CM_OBJECT_TOKEN_FIXER TokenFixer[EArmObjMax] = {
NULL, ///< 19 - SMMU Interrupt Array
TokenFixerNotImplemented, ///< 20 - Processor Hierarchy Info
TokenFixerNotImplemented, ///< 21 - Cache Info
- NULL, ///< 22 - Memory Affinity Info
- NULL, ///< 23 - Device Handle Acpi
- NULL, ///< 24 - Device Handle Pci
- NULL, ///< 25 - Generic Initiator Affinity
- NULL, ///< 26 - CMN-600 Info
- NULL, ///< 27 - Lpi Info
- NULL, ///< 28 - Reserved Memory Range Node
- NULL, ///< 29 - Memory Range Descriptor
- NULL, ///< 30 - Continuous Performance Control
Info
- NULL, ///< 31 - Pcc Subspace Type 0 Info
+ NULL, ///< 22 - Device Handle Acpi
+ NULL, ///< 23 - Device Handle Pci
+ NULL, ///< 24 - Generic Initiator Affinity
+ NULL, ///< 25 - CMN-600 Info
+ NULL, ///< 26 - Lpi Info
+ NULL, ///< 27 - Reserved Memory Range Node
+ NULL, ///< 28 - Memory Range Descriptor
+ NULL, ///< 29 - Continuous Performance Control
Info
+ NULL, ///< 30 - Pcc Subspace Type 0 Info
+ NULL, ///< 31 - Pcc Subspace Type 2 Info
NULL, ///< 32 - Pcc Subspace Type 2 Info
- NULL, ///< 33 - Pcc Subspace Type 2 Info
- NULL, ///< 34 - Pcc Subspace Type 3 Info
- NULL, ///< 35 - Pcc Subspace Type 4 Info
- NULL, ///< 36 - Pcc Subspace Type 5 Info
- NULL, ///< 37 - Embedded Trace Extension/Module
Info
- NULL ///< 38 - P-State Dependency (PSD) Info
+ NULL, ///< 33 - Pcc Subspace Type 3 Info
+ NULL, ///< 34 - Pcc Subspace Type 4 Info
+ NULL, ///< 35 - Pcc Subspace Type 5 Info
+ NULL, ///< 36 - Embedded Trace Extension/Module
Info
+ NULL ///< 37 - P-State Dependency (PSD) Info
};
/** CmObj token fixer.
diff --git
a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
index 4ca35d65fca3..b2fe74cd4f9b 100644
---
a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
+++
b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
@@ -356,9 +356,9 @@ STATIC CONST CM_OBJ_PARSER CmArchCommonObjRefParser[] = {
{ "ReferenceToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL }
};
-/** A parser for EArmObjMemoryAffinityInfo.
+/** A parser for EArchCommonObjMemoryAffinityInfo.
*/
-STATIC CONST CM_OBJ_PARSER CmArmMemoryAffinityInfoParser[] = {
+STATIC CONST CM_OBJ_PARSER CmArchCommonMemoryAffinityInfoParser[] = {
{ "ProximityDomain", 4, "0x%x", NULL },
{ "BaseAddress", 8, "0x%llx", NULL },
{ "Length", 8, "0x%llx", NULL },
@@ -681,6 +681,7 @@ STATIC CONST CM_OBJ_PARSER_ARRAY
ArchCommonNamespaceObjectParser[] = {
CM_PARSER_ADD_OBJECT (EArchCommonObjPciConfigSpaceInfo,
CmArchCommonPciConfigSpaceInfoParser),
CM_PARSER_ADD_OBJECT (EArchCommonObjPciAddressMapInfo,
CmArchCommonPciAddressMapInfoParser),
CM_PARSER_ADD_OBJECT (EArchCommonObjPciInterruptMapInfo,
CmArchCommonPciInterruptMapInfoParser),
+ CM_PARSER_ADD_OBJECT (EArchCommonObjMemoryAffinityInfo,
CmArchCommonMemoryAffinityInfoParser),
CM_PARSER_ADD_OBJECT_RESERVED (EArchCommonObjMax)
};
@@ -709,7 +710,6 @@ STATIC CONST CM_OBJ_PARSER_ARRAY
ArmNamespaceObjectParser[] = {
CM_PARSER_ADD_OBJECT (EArmObjSmmuInterruptArray,
CmArchCommonGenericInterruptParser),
CM_PARSER_ADD_OBJECT (EArmObjProcHierarchyInfo,
CmArmProcHierarchyInfoParser),
CM_PARSER_ADD_OBJECT (EArmObjCacheInfo,
CmArmCacheInfoParser),
- CM_PARSER_ADD_OBJECT (EArmObjMemoryAffinityInfo,
CmArmMemoryAffinityInfoParser),
CM_PARSER_ADD_OBJECT (EArmObjDeviceHandleAcpi,
CmArmDeviceHandleAcpiParser),
CM_PARSER_ADD_OBJECT (EArmObjDeviceHandlePci,
CmArmDeviceHandlePciParser),
CM_PARSER_ADD_OBJECT
(EArmObjGenericInitiatorAffinityInfo,CmArmGenericInitiatorAffinityInfoParser),
diff --git a/DynamicTablesPkg/Readme.md b/DynamicTablesPkg/Readme.md
index 558cf69afad6..55311fd4cef5 100644
--- a/DynamicTablesPkg/Readme.md
+++ b/DynamicTablesPkg/Readme.md
@@ -462,23 +462,22 @@ The CM_OBJECT_ID type is used to identify the
Configuration Manager
| 19 | SMMU Interrupt Array | |
| 20 | Processor Hierarchy Info | Move to Arch Common NS |
| 21 | Cache Info | Move to Arch Common NS |
-| 22 | Memory Affinity Info | Move to Arch Common NS |
-| 23 | Device Handle Acpi | Move to Arch Common NS |
-| 24 | Device Handle PCI | Move to Arch Common NS |
-| 25 | Generic Initiator Affinity Info | Move to Arch Common NS |
-| 26 | CMN 600 Info | |
-| 27 | Low Power Idle State Info | Move to Arch Common NS |
-| 28 | Reserved Memory Range Node | |
-| 29 | Memory Range Descriptor | |
-| 30 | Continuous Performance Control Info | Move to Arch Common NS |
-| 31 | Pcc Subspace Type 0 Info | Move to Arch Common NS |
-| 32 | Pcc Subspace Type 1 Info | Move to Arch Common NS |
-| 33 | Pcc Subspace Type 2 Info | Move to Arch Common NS |
-| 34 | Pcc Subspace Type 3 Info | Move to Arch Common NS |
-| 35 | Pcc Subspace Type 4 Info | Move to Arch Common NS |
-| 36 | Pcc Subspace Type 5 Info | Move to Arch Common NS |
-| 37 | Embedded Trace Extension/Module Info | |
-| 38 | P-State Dependency (PSD) Info | Move to Arch Common NS |
+| 22 | Device Handle Acpi | Move to Arch Common NS |
+| 23 | Device Handle PCI | Move to Arch Common NS |
+| 24 | Generic Initiator Affinity Info | Move to Arch Common NS |
+| 25 | CMN 600 Info | |
+| 26 | Low Power Idle State Info | Move to Arch Common NS |
+| 27 | Reserved Memory Range Node | |
+| 28 | Memory Range Descriptor | |
+| 29 | Continuous Performance Control Info | Move to Arch Common NS |
+| 30 | Pcc Subspace Type 0 Info | Move to Arch Common NS |
+| 31 | Pcc Subspace Type 1 Info | Move to Arch Common NS |
+| 32 | Pcc Subspace Type 2 Info | Move to Arch Common NS |
+| 33 | Pcc Subspace Type 3 Info | Move to Arch Common NS |
+| 34 | Pcc Subspace Type 4 Info | Move to Arch Common NS |
+| 35 | Pcc Subspace Type 5 Info | Move to Arch Common NS |
+| 36 | Embedded Trace Extension/Module Info | |
+| 37 | P-State Dependency (PSD) Info | Move to Arch Common NS |
| `*` | All other values are reserved. | |
#### Object ID's in the Arch Common Namespace:
@@ -496,4 +495,5 @@ The CM_OBJECT_ID type is used to identify the Configuration
Manager
| 8 | PCI Configuration Space Info | |
| 9 | PCI Address Map Info | |
| 10 | PCI Interrupt Map Info | |
+| 11 | Memory Affinity Info | |
| `*` | All other values are reserved. | |
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116982): https://edk2.groups.io/g/devel/message/116982
Mute This Topic: https://groups.io/mt/105068152/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
