diff options
Diffstat (limited to 'DynamicTablesPkg/Library')
3 files changed, 55 insertions, 56 deletions
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c index 57aaaf85e6..ea8c821d11 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c @@ -25,7 +25,7 @@ Requirements:
The following Configuration Manager Object(s) are required by
this Generator:
- - EArmObjPowerManagementProfileInfo
+ - EArchCommonObjPowerManagementProfileInfo
- EArmObjBootArchInfo
- EArmObjHypervisorVendorIdentity (OPTIONAL)
*/
@@ -202,9 +202,9 @@ EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE AcpiFadt = { Management Profile Information from the Configuration Manager.
*/
GET_OBJECT_LIST (
- EObjNameSpaceArm,
- EArmObjPowerManagementProfileInfo,
- CM_ARM_POWER_MANAGEMENT_PROFILE_INFO
+ EObjNameSpaceArchCommon,
+ EArchCommonObjPowerManagementProfileInfo,
+ CM_ARCH_COMMON_POWER_MANAGEMENT_PROFILE_INFO
);
/** This macro expands to a function that retrieves the Boot
@@ -253,13 +253,13 @@ FadtAddPmProfileInfo ( IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol
)
{
- EFI_STATUS Status;
- CM_ARM_POWER_MANAGEMENT_PROFILE_INFO *PmProfile;
+ EFI_STATUS Status;
+ CM_ARCH_COMMON_POWER_MANAGEMENT_PROFILE_INFO *PmProfile;
ASSERT (CfgMgrProtocol != NULL);
// Get the Power Management Profile from the Platform Configuration Manager
- Status = GetEArmObjPowerManagementProfileInfo (
+ Status = GetEArchCommonObjPowerManagementProfileInfo (
CfgMgrProtocol,
CM_NULL_TOKEN,
&PmProfile,
diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c index 833fa2d6a2..ef2a8dcfdd 100644 --- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c +++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c @@ -145,53 +145,52 @@ CONST CM_OBJECT_TOKEN_FIXER TokenFixer[EArmObjMax] = {
NULL, ///< 0 - Reserved
NULL, ///< 1 - Boot Architecture Info
- NULL, ///< 2 - Power Management Profile Info
- NULL, ///< 3 - GIC CPU Interface Info
- NULL, ///< 4 - GIC Distributor Info
- NULL, ///< 5 - GIC MSI Frame Info
- NULL, ///< 6 - GIC Redistributor Info
- NULL, ///< 7 - GIC ITS Info
- NULL, ///< 8 - Serial Console Port Info
- NULL, ///< 9 - Serial Debug Port Info
- NULL, ///< 10 - Generic Timer Info
- NULL, ///< 11 - Platform GT Block Info
- NULL, ///< 12 - Generic Timer Block Frame Info
- NULL, ///< 13 - Platform Generic Watchdog
- NULL, ///< 14 - PCI Configuration Space Info
- NULL, ///< 15 - Hypervisor Vendor Id
- NULL, ///< 16 - Fixed feature flags for FADT
- TokenFixerItsGroup, ///< 17 - ITS Group
- TokenFixerNamedComponentNode, ///< 18 - Named Component
- TokenFixerRootComplexNode, ///< 19 - Root Complex
- TokenFixerNotImplemented, ///< 20 - SMMUv1 or SMMUv2
- TokenFixerSmmuV3Node, ///< 21 - SMMUv3
- TokenFixerNotImplemented, ///< 22 - PMCG
- NULL, ///< 23 - GIC ITS Identifier Array
- NULL, ///< 24 - ID Mapping Array
- NULL, ///< 25 - SMMU Interrupt Array
- TokenFixerNotImplemented, ///< 26 - Processor Hierarchy Info
- TokenFixerNotImplemented, ///< 27 - Cache Info
- NULL, ///< 28 - CM Object Reference
- NULL, ///< 29 - Memory Affinity Info
- NULL, ///< 30 - Device Handle Acpi
- NULL, ///< 31 - Device Handle Pci
- NULL, ///< 32 - Generic Initiator Affinity
- NULL, ///< 33 - Generic Serial Port Info
- NULL, ///< 34 - CMN-600 Info
- NULL, ///< 35 - Lpi Info
- NULL, ///< 36 - Pci Address Map Info
- NULL, ///< 37 - Pci Interrupt Map Info
- NULL, ///< 38 - Reserved Memory Range Node
- NULL, ///< 39 - Memory Range Descriptor
- NULL, ///< 40 - Continuous Performance Control Info
- NULL, ///< 41 - Pcc Subspace Type 0 Info
+ NULL, ///< 2 - GIC CPU Interface Info
+ NULL, ///< 3 - GIC Distributor Info
+ NULL, ///< 4 - GIC MSI Frame Info
+ NULL, ///< 5 - GIC Redistributor Info
+ NULL, ///< 6 - GIC ITS Info
+ NULL, ///< 7 - Serial Console Port Info
+ NULL, ///< 8 - Serial Debug Port Info
+ NULL, ///< 9 - Generic Timer Info
+ NULL, ///< 10 - Platform GT Block Info
+ NULL, ///< 11 - Generic Timer Block Frame Info
+ NULL, ///< 12 - Platform Generic Watchdog
+ NULL, ///< 13 - PCI Configuration Space Info
+ NULL, ///< 14 - Hypervisor Vendor Id
+ NULL, ///< 15 - Fixed feature flags for FADT
+ TokenFixerItsGroup, ///< 16 - ITS Group
+ TokenFixerNamedComponentNode, ///< 17 - Named Component
+ TokenFixerRootComplexNode, ///< 18 - Root Complex
+ TokenFixerNotImplemented, ///< 19 - SMMUv1 or SMMUv2
+ TokenFixerSmmuV3Node, ///< 20 - SMMUv3
+ TokenFixerNotImplemented, ///< 21 - PMCG
+ NULL, ///< 22 - GIC ITS Identifier Array
+ NULL, ///< 23 - ID Mapping Array
+ NULL, ///< 24 - SMMU Interrupt Array
+ TokenFixerNotImplemented, ///< 25 - Processor Hierarchy Info
+ TokenFixerNotImplemented, ///< 26 - Cache Info
+ NULL, ///< 27 - CM Object Reference
+ NULL, ///< 28 - Memory Affinity Info
+ NULL, ///< 29 - Device Handle Acpi
+ NULL, ///< 30 - Device Handle Pci
+ NULL, ///< 31 - Generic Initiator Affinity
+ NULL, ///< 32 - Generic Serial Port Info
+ NULL, ///< 33 - CMN-600 Info
+ NULL, ///< 34 - Lpi Info
+ NULL, ///< 35 - Pci Address Map Info
+ NULL, ///< 36 - Pci Interrupt Map Info
+ NULL, ///< 37 - Reserved Memory Range Node
+ NULL, ///< 38 - Memory Range Descriptor
+ NULL, ///< 39 - Continuous Performance Control Info
+ NULL, ///< 40 - Pcc Subspace Type 0 Info
+ NULL, ///< 41 - Pcc Subspace Type 2 Info
NULL, ///< 42 - Pcc Subspace Type 2 Info
- NULL, ///< 43 - Pcc Subspace Type 2 Info
- NULL, ///< 44 - Pcc Subspace Type 3 Info
- NULL, ///< 45 - Pcc Subspace Type 4 Info
- NULL, ///< 46 - Pcc Subspace Type 5 Info
- NULL, ///< 47 - Embedded Trace Extension/Module Info
- NULL ///< 48 - P-State Dependency (PSD) Info
+ NULL, ///< 43 - Pcc Subspace Type 3 Info
+ NULL, ///< 44 - Pcc Subspace Type 4 Info
+ NULL, ///< 45 - Pcc Subspace Type 5 Info
+ NULL, ///< 46 - Embedded Trace Extension/Module Info
+ NULL ///< 47 - 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 6896463b28..0d3e53312b 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c @@ -57,9 +57,9 @@ STATIC CONST CM_OBJ_PARSER CmArmBootArchInfoParser[] = { { "BootArchFlags", 2, "0x%x", NULL }
};
-/** A parser for EArmObjPowerManagementProfileInfo.
+/** A parser for EArchCommonObjPowerManagementProfileInfo.
*/
-STATIC CONST CM_OBJ_PARSER CmArmPowerManagementProfileInfoParser[] = {
+STATIC CONST CM_OBJ_PARSER CmArchCommonPowerManagementProfileInfoParser[] = {
{ "PowerManagementProfile", 1, "0x%x", NULL }
};
@@ -671,6 +671,7 @@ STATIC CONST CM_OBJ_PARSER CmArmPsdInfoParser[] = { */
STATIC CONST CM_OBJ_PARSER_ARRAY ArchCommonNamespaceObjectParser[] = {
CM_PARSER_ADD_OBJECT_RESERVED (EArchCommonObjReserved),
+ CM_PARSER_ADD_OBJECT (EArchCommonObjPowerManagementProfileInfo,CmArchCommonPowerManagementProfileInfoParser),
CM_PARSER_ADD_OBJECT_RESERVED (EArchCommonObjMax)
};
@@ -679,7 +680,6 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArchCommonNamespaceObjectParser[] = { STATIC CONST CM_OBJ_PARSER_ARRAY ArmNamespaceObjectParser[] = {
CM_PARSER_ADD_OBJECT_RESERVED (EArmObjReserved),
CM_PARSER_ADD_OBJECT (EArmObjBootArchInfo, CmArmBootArchInfoParser),
- CM_PARSER_ADD_OBJECT (EArmObjPowerManagementProfileInfo, CmArmPowerManagementProfileInfoParser),
CM_PARSER_ADD_OBJECT (EArmObjGicCInfo, CmArmGicCInfoParser),
CM_PARSER_ADD_OBJECT (EArmObjGicDInfo, CmArmGicDInfoParser),
CM_PARSER_ADD_OBJECT (EArmObjGicMsiFrameInfo, CmArmGicMsiFrameInfoParser),
|