diff options
| author | Sami Mujawar <sami.mujawar@arm.com> | 2024-03-06 10:49:04 +0000 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-07-29 13:44:55 +0000 |
| commit | 87a53216e7ddce449c76f80d52db6a60fa3d1079 (patch) | |
| tree | e84ddc8ff3f90ddcbfaedf6aa6c24452680b2a26 /DynamicTablesPkg/Library | |
| parent | e5d8bd476c1e8dfaa95f2b0c1cdda144e3b985d8 (diff) | |
| download | edk2-87a53216e7ddce449c76f80d52db6a60fa3d1079.tar.gz | |
DynamicTablesPkg: Move Hypervisor Vendor Id to Arch Common
Move Hypervisor Vendor Id info object from Arm Namespace to
the Arch Common namespace.
Correspondingly also update the following modules to reflect the
changes introduced by the move:
- FADT Generator
- ConfigurationManagerObjectParser
- Dynamic Plat Repo TokenFixer map.
Cc: Pierre Gondois <Pierre.Gondois@arm.com>
Cc: Yeo Reum Yun <YeoReum.Yun@arm.com>
Cc: AbdulLateef Attar <AbdulLateef.Attar@amd.com>
Cc: Jeshua Smith <jeshuas@nvidia.com>
Cc: Jeff Brasen <jbrasen@nvidia.com>
Cc: Girish Mahadevan <gmahadevan@nvidia.com>
Cc: Leif Lindholm <quic_llindhol@quicinc.com>
Cc: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
Diffstat (limited to 'DynamicTablesPkg/Library')
3 files changed, 41 insertions, 42 deletions
diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c index ea8c821d11..868a974fed 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c @@ -27,7 +27,7 @@ Requirements: this Generator:
- EArchCommonObjPowerManagementProfileInfo
- EArmObjBootArchInfo
- - EArmObjHypervisorVendorIdentity (OPTIONAL)
+ - EArchCommonObjHypervisorVendorIdentity (OPTIONAL)
*/
/** This macro defines the FADT flag options for ARM Platforms.
@@ -220,9 +220,9 @@ GET_OBJECT_LIST ( Vendor ID from the Configuration Manager.
*/
GET_OBJECT_LIST (
- EObjNameSpaceArm,
- EArmObjHypervisorVendorIdentity,
- CM_ARM_HYPERVISOR_VENDOR_ID
+ EObjNameSpaceArchCommon,
+ EArchCommonObjHypervisorVendorIdentity,
+ CM_ARCH_COMMON_HYPERVISOR_VENDOR_ID
);
/** This macro expands to a function that retrieves the Fixed
@@ -358,13 +358,13 @@ FadtAddHypervisorVendorId ( IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol
)
{
- EFI_STATUS Status;
- CM_ARM_HYPERVISOR_VENDOR_ID *HypervisorVendorInfo;
+ EFI_STATUS Status;
+ CM_ARCH_COMMON_HYPERVISOR_VENDOR_ID *HypervisorVendorInfo;
ASSERT (CfgMgrProtocol != NULL);
// Get the Hypervisor Vendor ID from the Platform Configuration Manager
- Status = GetEArmObjHypervisorVendorIdentity (
+ Status = GetEArchCommonObjHypervisorVendorIdentity (
CfgMgrProtocol,
CM_NULL_TOKEN,
&HypervisorVendorInfo,
@@ -391,7 +391,7 @@ FadtAddHypervisorVendorId ( DEBUG ((
DEBUG_INFO,
- "FADT: EArmObjHypervisorVendorIdentity = 0x%lx\n",
+ "FADT: EArchCommonObjHypervisorVendorIdentity = 0x%lx\n",
HypervisorVendorInfo->HypervisorVendorId
));
diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c index 412bf41647..34ba9f2673 100644 --- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c +++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c @@ -155,39 +155,38 @@ CM_OBJECT_TOKEN_FIXER TokenFixer[EArmObjMax] = { NULL, ///< 9 - Generic Timer Block Frame Info
NULL, ///< 10 - Platform Generic Watchdog
NULL, ///< 11 - PCI Configuration Space Info
- NULL, ///< 12 - Hypervisor Vendor Id
- NULL, ///< 13 - Fixed feature flags for FADT
- TokenFixerItsGroup, ///< 14 - ITS Group
- TokenFixerNamedComponentNode, ///< 15 - Named Component
- TokenFixerRootComplexNode, ///< 16 - Root Complex
- TokenFixerNotImplemented, ///< 17 - SMMUv1 or SMMUv2
- TokenFixerSmmuV3Node, ///< 18 - SMMUv3
- TokenFixerNotImplemented, ///< 19 - PMCG
- NULL, ///< 20 - GIC ITS Identifier Array
- NULL, ///< 21 - ID Mapping Array
- NULL, ///< 22 - SMMU Interrupt Array
- TokenFixerNotImplemented, ///< 23 - Processor Hierarchy Info
- TokenFixerNotImplemented, ///< 24 - Cache Info
+ NULL, ///< 12 - Fixed feature flags for FADT
+ TokenFixerItsGroup, ///< 13 - ITS Group
+ TokenFixerNamedComponentNode, ///< 14 - Named Component
+ TokenFixerRootComplexNode, ///< 15 - Root Complex
+ TokenFixerNotImplemented, ///< 16 - SMMUv1 or SMMUv2
+ TokenFixerSmmuV3Node, ///< 17 - SMMUv3
+ TokenFixerNotImplemented, ///< 18 - PMCG
+ NULL, ///< 19 - GIC ITS Identifier Array
+ NULL, ///< 20 - ID Mapping Array
+ NULL, ///< 21 - SMMU Interrupt Array
+ TokenFixerNotImplemented, ///< 22 - Processor Hierarchy Info
+ TokenFixerNotImplemented, ///< 23 - Cache Info
+ NULL, ///< 24 - Memory Affinity Info
NULL, ///< 25 - Memory Affinity Info
- NULL, ///< 26 - Memory Affinity Info
- NULL, ///< 27 - Device Handle Acpi
- NULL, ///< 28 - Device Handle Pci
- NULL, ///< 29 - Generic Initiator Affinity
- NULL, ///< 30 - CMN-600 Info
- NULL, ///< 31 - Lpi Info
- NULL, ///< 32 - Pci Address Map Info
- NULL, ///< 33 - Pci Interrupt Map Info
- NULL, ///< 34 - Reserved Memory Range Node
- NULL, ///< 35 - Memory Range Descriptor
- NULL, ///< 36 - Continuous Performance Control Info
- NULL, ///< 37 - Pcc Subspace Type 0 Info
+ NULL, ///< 26 - Device Handle Acpi
+ NULL, ///< 27 - Device Handle Pci
+ NULL, ///< 28 - Generic Initiator Affinity
+ NULL, ///< 29 - CMN-600 Info
+ NULL, ///< 30 - Lpi Info
+ NULL, ///< 31 - Pci Address Map Info
+ NULL, ///< 32 - Pci Interrupt Map Info
+ NULL, ///< 33 - Reserved Memory Range Node
+ NULL, ///< 34 - Memory Range Descriptor
+ NULL, ///< 35 - Continuous Performance Control Info
+ NULL, ///< 36 - Pcc Subspace Type 0 Info
+ NULL, ///< 37 - Pcc Subspace Type 2 Info
NULL, ///< 38 - Pcc Subspace Type 2 Info
- NULL, ///< 39 - Pcc Subspace Type 2 Info
- NULL, ///< 40 - Pcc Subspace Type 3 Info
- NULL, ///< 41 - Pcc Subspace Type 4 Info
- NULL, ///< 42 - Pcc Subspace Type 5 Info
- NULL, ///< 43 - Embedded Trace Extension/Module Info
- NULL ///< 44 - P-State Dependency (PSD) Info
+ NULL, ///< 39 - Pcc Subspace Type 3 Info
+ NULL, ///< 40 - Pcc Subspace Type 4 Info
+ NULL, ///< 41 - Pcc Subspace Type 5 Info
+ NULL, ///< 42 - Embedded Trace Extension/Module Info
+ NULL ///< 43 - 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 334d2a0265..1b3532f940 100644 --- a/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c +++ b/DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c @@ -193,9 +193,9 @@ STATIC CONST CM_OBJ_PARSER CmArmPciConfigSpaceInfoParser[] = { { "InterruptMapToken", sizeof (CM_OBJECT_TOKEN), "0x%p", NULL },
};
-/** A parser for EArmObjHypervisorVendorIdentity.
+/** A parser for EArchCommonObjHypervisorVendorIdentity.
*/
-STATIC CONST CM_OBJ_PARSER CmArmHypervisorVendorIdParser[] = {
+STATIC CONST CM_OBJ_PARSER CmArchCommonHypervisorVendorIdentityParser[] = {
{ "HypervisorVendorId", 8, "0x%llx", NULL }
};
@@ -675,6 +675,7 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArchCommonNamespaceObjectParser[] = { CM_PARSER_ADD_OBJECT (EArchCommonObjSerialPortInfo, CmArchCommonSerialPortInfoParser),
CM_PARSER_ADD_OBJECT (EArchCommonObjConsolePortInfo, CmArchCommonSerialPortInfoParser),
CM_PARSER_ADD_OBJECT (EArchCommonObjSerialDebugPortInfo, CmArchCommonSerialPortInfoParser),
+ CM_PARSER_ADD_OBJECT (EArchCommonObjHypervisorVendorIdentity, CmArchCommonHypervisorVendorIdentityParser),
CM_PARSER_ADD_OBJECT_RESERVED (EArchCommonObjMax)
};
@@ -693,7 +694,6 @@ STATIC CONST CM_OBJ_PARSER_ARRAY ArmNamespaceObjectParser[] = { CM_PARSER_ADD_OBJECT (EArmObjGTBlockTimerFrameInfo, CmArmGTBlockTimerFrameInfoParser),
CM_PARSER_ADD_OBJECT (EArmObjPlatformGenericWatchdogInfo, CmArmGenericWatchdogInfoParser),
CM_PARSER_ADD_OBJECT (EArmObjPciConfigSpaceInfo, CmArmPciConfigSpaceInfoParser),
- CM_PARSER_ADD_OBJECT (EArmObjHypervisorVendorIdentity, CmArmHypervisorVendorIdParser),
CM_PARSER_ADD_OBJECT (EArmObjFixedFeatureFlags, CmArmFixedFeatureFlagsParser),
CM_PARSER_ADD_OBJECT (EArmObjItsGroup, CmArmItsGroupNodeParser),
CM_PARSER_ADD_OBJECT (EArmObjNamedComponent, CmArmNamedComponentNodeParser),
|