Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Sami Mujawar 2024-03-06 10:49:04 +00:00 committed by mergify[bot]
parent e5d8bd476c
commit 87a53216e7
6 changed files with 117 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DynamicTablesPkg/Include/ArchCommonNameSpaceObjects.h
View File

@ -25,6 +25,7 @@ typedef enum ArchCommonObjectID {
EArchCommonObjSerialPortInfo, ///< 2 - Generic Serial Port Info
EArchCommonObjConsolePortInfo, ///< 3 - Serial Console Port Info
EArchCommonObjSerialDebugPortInfo, ///< 4 - Serial Debug Port Info
EArchCommonObjHypervisorVendorIdentity, ///< 5 - Hypervisor Vendor Id
EArchCommonObjMax
} EARCH_COMMON_OBJECT_ID;
@ -75,6 +76,16 @@ typedef struct EArchCommonSerialPortInfo {
UINT8 AccessSize;
} CM_ARCH_COMMON_SERIAL_PORT_INFO;
/** A structure that describes the
Hypervisor Vendor ID information for the Platform.
ID: EArchCommonObjHypervisorVendorIdentity
*/
typedef struct CmArchCommonHypervisorVendorIdentity {
/// The hypervisor Vendor ID
UINT64 HypervisorVendorId;
} CM_ARCH_COMMON_HYPERVISOR_VENDOR_ID;
#pragma pack()
#endif // ARCH_COMMON_NAMESPACE_OBJECTS_H_

75
DynamicTablesPkg/Include/ArmNameSpaceObjects.h
View File

@ -40,39 +40,38 @@ typedef enum ArmObjectID {
EArmObjGTBlockTimerFrameInfo, ///< 9 - Generic Timer Block Frame Info
EArmObjPlatformGenericWatchdogInfo, ///< 10 - Platform Generic Watchdog
EArmObjPciConfigSpaceInfo, ///< 11 - PCI Configuration Space Info
EArmObjHypervisorVendorIdentity, ///< 12 - Hypervisor Vendor Id
EArmObjFixedFeatureFlags, ///< 13 - Fixed feature flags for FADT
EArmObjItsGroup, ///< 14 - ITS Group
EArmObjNamedComponent, ///< 15 - Named Component
EArmObjRootComplex, ///< 16 - Root Complex
EArmObjSmmuV1SmmuV2, ///< 17 - SMMUv1 or SMMUv2
EArmObjSmmuV3, ///< 18 - SMMUv3
EArmObjPmcg, ///< 19 - PMCG
EArmObjGicItsIdentifierArray, ///< 20 - GIC ITS Identifier Array
EArmObjIdMappingArray, ///< 21 - ID Mapping Array
EArmObjSmmuInterruptArray, ///< 22 - SMMU Interrupt Array
EArmObjProcHierarchyInfo, ///< 23 - Processor Hierarchy Info
EArmObjCacheInfo, ///< 24 - Cache Info
EArmObjCmRef, ///< 25 - CM Object Reference
EArmObjMemoryAffinityInfo, ///< 26 - Memory Affinity Info
EArmObjDeviceHandleAcpi, ///< 27 - Device Handle Acpi
EArmObjDeviceHandlePci, ///< 28 - Device Handle Pci
EArmObjGenericInitiatorAffinityInfo, ///< 29 - Generic Initiator Affinity
EArmObjCmn600Info, ///< 30 - CMN-600 Info
EArmObjLpiInfo, ///< 31 - Lpi Info
EArmObjPciAddressMapInfo, ///< 32 - Pci Address Map Info
EArmObjPciInterruptMapInfo, ///< 33 - Pci Interrupt Map Info
EArmObjRmr, ///< 34 - Reserved Memory Range Node
EArmObjMemoryRangeDescriptor, ///< 35 - Memory Range Descriptor
EArmObjCpcInfo, ///< 36 - Continuous Performance Control Info
EArmObjPccSubspaceType0Info, ///< 37 - Pcc Subspace Type 0 Info
EArmObjPccSubspaceType1Info, ///< 38 - Pcc Subspace Type 2 Info
EArmObjPccSubspaceType2Info, ///< 39 - Pcc Subspace Type 2 Info
EArmObjPccSubspaceType3Info, ///< 40 - Pcc Subspace Type 3 Info
EArmObjPccSubspaceType4Info, ///< 41 - Pcc Subspace Type 4 Info
EArmObjPccSubspaceType5Info, ///< 42 - Pcc Subspace Type 5 Info
EArmObjEtInfo, ///< 43 - Embedded Trace Extension/Module Info
EArmObjPsdInfo, ///< 44 - P-State Dependency (PSD) Info
EArmObjFixedFeatureFlags, ///< 12 - Fixed feature flags for FADT
EArmObjItsGroup, ///< 13 - ITS Group
EArmObjNamedComponent, ///< 14 - Named Component
EArmObjRootComplex, ///< 15 - Root Complex
EArmObjSmmuV1SmmuV2, ///< 16 - SMMUv1 or SMMUv2
EArmObjSmmuV3, ///< 17 - SMMUv3
EArmObjPmcg, ///< 18 - PMCG
EArmObjGicItsIdentifierArray, ///< 19 - GIC ITS Identifier Array
EArmObjIdMappingArray, ///< 20 - ID Mapping Array
EArmObjSmmuInterruptArray, ///< 21 - SMMU Interrupt Array
EArmObjProcHierarchyInfo, ///< 22 - Processor Hierarchy Info
EArmObjCacheInfo, ///< 23 - Cache Info
EArmObjCmRef, ///< 24 - CM Object Reference
EArmObjMemoryAffinityInfo, ///< 25 - Memory Affinity Info
EArmObjDeviceHandleAcpi, ///< 26 - Device Handle Acpi
EArmObjDeviceHandlePci, ///< 27 - Device Handle Pci
EArmObjGenericInitiatorAffinityInfo, ///< 28 - Generic Initiator Affinity
EArmObjCmn600Info, ///< 29 - CMN-600 Info
EArmObjLpiInfo, ///< 30 - Lpi Info
EArmObjPciAddressMapInfo, ///< 31 - Pci Address Map Info
EArmObjPciInterruptMapInfo, ///< 32 - Pci Interrupt Map Info
EArmObjRmr, ///< 33 - Reserved Memory Range Node
EArmObjMemoryRangeDescriptor, ///< 34 - Memory Range Descriptor
EArmObjCpcInfo, ///< 35 - Continuous Performance Control Info
EArmObjPccSubspaceType0Info, ///< 36 - Pcc Subspace Type 0 Info
EArmObjPccSubspaceType1Info, ///< 37 - Pcc Subspace Type 2 Info
EArmObjPccSubspaceType2Info, ///< 38 - Pcc Subspace Type 2 Info
EArmObjPccSubspaceType3Info, ///< 39 - Pcc Subspace Type 3 Info
EArmObjPccSubspaceType4Info, ///< 40 - Pcc Subspace Type 4 Info
EArmObjPccSubspaceType5Info, ///< 41 - Pcc Subspace Type 5 Info
EArmObjEtInfo, ///< 42 - Embedded Trace Extension/Module Info
EArmObjPsdInfo, ///< 43 - P-State Dependency (PSD) Info
EArmObjMax
} EARM_OBJECT_ID;
@ -438,16 +437,6 @@ typedef struct CmArmPciConfigSpaceInfo {
CM_OBJECT_TOKEN InterruptMapToken;
} CM_ARM_PCI_CONFIG_SPACE_INFO;
/** A structure that describes the
Hypervisor Vendor ID information for the Platform.
ID: EArmObjHypervisorVendorIdentity
*/
typedef struct CmArmHypervisorVendorId {
/// The hypervisor Vendor ID
UINT64 HypervisorVendorId;
} CM_ARM_HYPERVISOR_VENDOR_ID;
/** A structure that describes the
Fixed feature flags for the Platform.

16
DynamicTablesPkg/Library/Acpi/Arm/AcpiFadtLibArm/FadtGenerator.c
View File

@ -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
));

61
DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
View File

@ -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.

6
DynamicTablesPkg/Library/Common/TableHelperLib/ConfigurationManagerObjectParser.c
View File

@ -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),

66
DynamicTablesPkg/Readme.md
View File

@ -452,39 +452,38 @@ The CM_OBJECT_ID type is used to identify the Configuration Manager
| 9 | Generic Timer Block Frame Info | |
| 10 | Platform Generic Watchdog | |
| 11 | PCI Configuration Space Info | Move to Arch Common NS |
| 12 | Hypervisor Vendor Id | Move to Arch Common NS |
| 13 | Fixed feature flags for FADT | Move to Arch Common NS |
| 14 | ITS Group | |
| 15 | Named Component | |
| 16 | Root Complex | |
| 17 | SMMUv1 or SMMUv2 | |
| 18 | SMMUv3 | |
| 19 | PMCG | |
| 20 | GIC ITS Identifier Array | |
| 21 | ID Mapping Array | |
| 22 | SMMU Interrupt Array | |
| 23 | Processor Hierarchy Info | Move to Arch Common NS |
| 24 | Cache Info | Move to Arch Common NS |
| 25 | CM Object Reference | Move to Arch Common NS |
| 26 | Memory Affinity Info | Move to Arch Common NS |
| 27 | Device Handle Acpi | Move to Arch Common NS |
| 28 | Device Handle PCI | Move to Arch Common NS |
| 29 | Generic Initiator Affinity Info | Move to Arch Common NS |
| 30 | CMN 600 Info | |
| 31 | Low Power Idle State Info | Move to Arch Common NS |
| 32 | PCI Address Map Info | Move to Arch Common NS |
| 33 | PCI Interrupt Map Info | Move to Arch Common NS |
| 34 | Reserved Memory Range Node | |
| 35 | Memory Range Descriptor | |
| 36 | Continuous Performance Control Info | Move to Arch Common NS |
| 37 | Pcc Subspace Type 0 Info | Move to Arch Common NS |
| 38 | Pcc Subspace Type 1 Info | Move to Arch Common NS |
| 39 | Pcc Subspace Type 2 Info | Move to Arch Common NS |
| 40 | Pcc Subspace Type 3 Info | Move to Arch Common NS |
| 41 | Pcc Subspace Type 4 Info | Move to Arch Common NS |
| 42 | Pcc Subspace Type 5 Info | Move to Arch Common NS |
| 43 | Embedded Trace Extension/Module Info | |
| 44 | P-State Dependency (PSD) Info | Move to Arch Common NS |
| 12 | Fixed feature flags for FADT | Move to Arch Common NS |
| 13 | ITS Group | |
| 14 | Named Component | |
| 15 | Root Complex | |
| 16 | SMMUv1 or SMMUv2 | |
| 17 | SMMUv3 | |
| 18 | PMCG | |
| 19 | GIC ITS Identifier Array | |
| 20 | ID Mapping Array | |
| 21 | SMMU Interrupt Array | |
| 22 | Processor Hierarchy Info | Move to Arch Common NS |
| 23 | Cache Info | Move to Arch Common NS |
| 24 | CM Object Reference | Move to Arch Common NS |
| 25 | Memory Affinity Info | Move to Arch Common NS |
| 26 | Device Handle Acpi | Move to Arch Common NS |
| 27 | Device Handle PCI | Move to Arch Common NS |
| 28 | Generic Initiator Affinity Info | Move to Arch Common NS |
| 29 | CMN 600 Info | |
| 30 | Low Power Idle State Info | Move to Arch Common NS |
| 31 | PCI Address Map Info | Move to Arch Common NS |
| 32 | PCI Interrupt Map Info | Move to Arch Common NS |
| 33 | Reserved Memory Range Node | |
| 34 | Memory Range Descriptor | |
| 35 | Continuous Performance Control Info | Move to Arch Common NS |
| 36 | Pcc Subspace Type 0 Info | Move to Arch Common NS |
| 37 | Pcc Subspace Type 1 Info | Move to Arch Common NS |
| 38 | Pcc Subspace Type 2 Info | Move to Arch Common NS |
| 39 | Pcc Subspace Type 3 Info | Move to Arch Common NS |
| 40 | Pcc Subspace Type 4 Info | Move to Arch Common NS |
| 41 | Pcc Subspace Type 5 Info | Move to Arch Common NS |
| 42 | Embedded Trace Extension/Module Info | |
| 43 | 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
| 2 | Serial Port Info | |
| 3 | Serial Console Port Info | |
| 4 | Serial Debug Port Info | |
| 5 | Hypervisor Vendor Id | |
| `*` | All other values are reserved. | |