STATIC\r
UINT32\r
GetProcHierarchyNodeSize (\r
- IN CONST CM_ARM_PROC_HIERARCHY_INFO * Node\r
+ IN CONST CM_ARM_PROC_HIERARCHY_INFO *Node\r
)\r
{\r
ASSERT (Node != NULL);\r
\r
// <size of Processor Hierarchy Node> + <size of Private Resources array>\r
return sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR) +\r
- (Node->NoOfPrivateResources * sizeof (UINT32));\r
+ (Node->NoOfPrivateResources * sizeof (UINT32));\r
}\r
\r
/**\r
STATIC\r
EFI_STATUS\r
GetPpttNodeReferencedByToken (\r
- IN PPTT_NODE_INDEXER * NodeIndexer,\r
- IN UINT32 NodeCount,\r
- IN CONST CM_OBJECT_TOKEN SearchToken,\r
- OUT PPTT_NODE_INDEXER ** IndexedNodeFound\r
+ IN PPTT_NODE_INDEXER *NodeIndexer,\r
+ IN UINT32 NodeCount,\r
+ IN CONST CM_OBJECT_TOKEN SearchToken,\r
+ OUT PPTT_NODE_INDEXER **IndexedNodeFound\r
)\r
{\r
EFI_STATUS Status;\r
\r
if (NodeIndexer->Token == SearchToken) {\r
*IndexedNodeFound = NodeIndexer;\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
DEBUG ((\r
DEBUG_INFO,\r
"PPTT: Node Indexer: Token = %p. Found, Status = %r\n",\r
));\r
return Status;\r
}\r
+\r
NodeIndexer++;\r
}\r
\r
STATIC\r
EFI_STATUS\r
DetectCyclesInTopology (\r
- IN CONST ACPI_PPTT_GENERATOR * CONST Generator\r
+ IN CONST ACPI_PPTT_GENERATOR *CONST Generator\r
)\r
{\r
- EFI_STATUS Status;\r
- PPTT_NODE_INDEXER * Iterator;\r
- PPTT_NODE_INDEXER * CycleDetector;\r
- UINT32 NodesRemaining;\r
+ EFI_STATUS Status;\r
+ PPTT_NODE_INDEXER *Iterator;\r
+ PPTT_NODE_INDEXER *CycleDetector;\r
+ UINT32 NodesRemaining;\r
\r
ASSERT (Generator != NULL);\r
\r
- Iterator = Generator->NodeIndexer;\r
+ Iterator = Generator->NodeIndexer;\r
NodesRemaining = Generator->ProcTopologyStructCount;\r
\r
while (NodesRemaining != 0) {\r
\r
// Stamp the visited node\r
CycleDetector->CycleDetectionStamp = NodesRemaining;\r
- CycleDetector = CycleDetector->TopologyParent;\r
+ CycleDetector = CycleDetector->TopologyParent;\r
} // Continue topology tree walk\r
\r
Iterator++;\r
STATIC\r
EFI_STATUS\r
AddPrivateResources (\r
- IN CONST ACPI_PPTT_GENERATOR * CONST Generator,\r
- IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol,\r
- IN UINT32 * PrivResArray,\r
+ IN CONST ACPI_PPTT_GENERATOR *CONST Generator,\r
+ IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,\r
+ IN UINT32 *PrivResArray,\r
IN UINT32 PrivResCount,\r
IN CONST CM_OBJECT_TOKEN PrivResArrayToken\r
)\r
{\r
- EFI_STATUS Status;\r
- CM_ARM_OBJ_REF * CmObjRefs;\r
- UINT32 CmObjRefCount;\r
- PPTT_NODE_INDEXER * PpttNodeFound;\r
+ EFI_STATUS Status;\r
+ CM_ARM_OBJ_REF *CmObjRefs;\r
+ UINT32 CmObjRefCount;\r
+ PPTT_NODE_INDEXER *PpttNodeFound;\r
\r
ASSERT (\r
(Generator != NULL) &&\r
BOOLEAN\r
EFIAPI\r
IsGicCTokenEqual (\r
- IN CONST VOID * Object1,\r
- IN CONST VOID * Object2,\r
- IN UINTN Index1,\r
- IN UINTN Index2\r
+ IN CONST VOID *Object1,\r
+ IN CONST VOID *Object2,\r
+ IN UINTN Index1,\r
+ IN UINTN Index2\r
)\r
{\r
- PPTT_NODE_INDEXER * IndexedObject1;\r
- PPTT_NODE_INDEXER * IndexedObject2;\r
- CM_ARM_PROC_HIERARCHY_INFO * ProcNode1;\r
- CM_ARM_PROC_HIERARCHY_INFO * ProcNode2;\r
+ PPTT_NODE_INDEXER *IndexedObject1;\r
+ PPTT_NODE_INDEXER *IndexedObject2;\r
+ CM_ARM_PROC_HIERARCHY_INFO *ProcNode1;\r
+ CM_ARM_PROC_HIERARCHY_INFO *ProcNode2;\r
\r
ASSERT (\r
(Object1 != NULL) &&\r
(Object2 != NULL)\r
);\r
\r
- IndexedObject1 = (PPTT_NODE_INDEXER*)Object1;\r
- IndexedObject2 = (PPTT_NODE_INDEXER*)Object2;\r
- ProcNode1 = (CM_ARM_PROC_HIERARCHY_INFO*)IndexedObject1->Object;\r
- ProcNode2 = (CM_ARM_PROC_HIERARCHY_INFO*)IndexedObject2->Object;\r
+ IndexedObject1 = (PPTT_NODE_INDEXER *)Object1;\r
+ IndexedObject2 = (PPTT_NODE_INDEXER *)Object2;\r
+ ProcNode1 = (CM_ARM_PROC_HIERARCHY_INFO *)IndexedObject1->Object;\r
+ ProcNode2 = (CM_ARM_PROC_HIERARCHY_INFO *)IndexedObject2->Object;\r
\r
if (IS_ACPI_PROC_ID_VALID (ProcNode1) &&\r
IS_ACPI_PROC_ID_VALID (ProcNode2) &&\r
(ProcNode1->GicCToken != CM_NULL_TOKEN) &&\r
(ProcNode2->GicCToken != CM_NULL_TOKEN) &&\r
- (ProcNode1->GicCToken == ProcNode2->GicCToken)) {\r
+ (ProcNode1->GicCToken == ProcNode2->GicCToken))\r
+ {\r
DEBUG ((\r
DEBUG_ERROR,\r
"ERROR: PPTT: Two Processor Hierarchy Info objects (%d and %d) map to " \\r
STATIC\r
EFI_STATUS\r
AddProcHierarchyNodes (\r
- IN CONST ACPI_PPTT_GENERATOR * CONST Generator,\r
- IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol,\r
- IN CONST EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt,\r
- IN CONST UINT32 NodesStartOffset\r
+ IN CONST ACPI_PPTT_GENERATOR *CONST Generator,\r
+ IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,\r
+ IN CONST EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER *Pptt,\r
+ IN CONST UINT32 NodesStartOffset\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR * ProcStruct;\r
- UINT32 * PrivateResources;\r
- BOOLEAN IsGicCTokenDuplicated;\r
+ EFI_STATUS Status;\r
+ EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR *ProcStruct;\r
+ UINT32 *PrivateResources;\r
+ BOOLEAN IsGicCTokenDuplicated;\r
\r
- CM_ARM_GICC_INFO * GicCInfoList;\r
- UINT32 GicCInfoCount;\r
- UINT32 UniqueGicCRefCount;\r
+ CM_ARM_GICC_INFO *GicCInfoList;\r
+ UINT32 GicCInfoCount;\r
+ UINT32 UniqueGicCRefCount;\r
\r
- PPTT_NODE_INDEXER * PpttNodeFound;\r
- CM_ARM_PROC_HIERARCHY_INFO * ProcInfoNode;\r
+ PPTT_NODE_INDEXER *PpttNodeFound;\r
+ CM_ARM_PROC_HIERARCHY_INFO *ProcInfoNode;\r
\r
- PPTT_NODE_INDEXER * ProcNodeIterator;\r
- UINT32 NodeCount;\r
- UINT32 Length;\r
+ PPTT_NODE_INDEXER *ProcNodeIterator;\r
+ UINT32 NodeCount;\r
+ UINT32 Length;\r
\r
ASSERT (\r
(Generator != NULL) &&\r
(Pptt != NULL)\r
);\r
\r
- ProcStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR*)((UINT8*)Pptt +\r
- NodesStartOffset);\r
+ ProcStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR *)((UINT8 *)Pptt +\r
+ NodesStartOffset);\r
\r
ProcNodeIterator = Generator->ProcHierarchyNodeIndexedList;\r
- NodeCount = Generator->ProcHierarchyNodeCount;\r
+ NodeCount = Generator->ProcHierarchyNodeCount;\r
\r
// Check if every GICC Object is referenced by onlu one Proc Node\r
IsGicCTokenDuplicated = FindDuplicateValue (\r
UniqueGicCRefCount = 0;\r
\r
while (NodeCount-- != 0) {\r
- ProcInfoNode = (CM_ARM_PROC_HIERARCHY_INFO*)ProcNodeIterator->Object;\r
+ ProcInfoNode = (CM_ARM_PROC_HIERARCHY_INFO *)ProcNodeIterator->Object;\r
\r
// Check if the private resource count is within the size limit\r
// imposed on the Processor Hierarchy node by the specification.\r
}\r
\r
// Populate the node header\r
- ProcStruct->Type = EFI_ACPI_6_3_PPTT_TYPE_PROCESSOR;\r
- ProcStruct->Length = (UINT8)Length;\r
+ ProcStruct->Type = EFI_ACPI_6_3_PPTT_TYPE_PROCESSOR;\r
+ ProcStruct->Length = (UINT8)Length;\r
ProcStruct->Reserved[0] = EFI_ACPI_RESERVED_BYTE;\r
ProcStruct->Reserved[1] = EFI_ACPI_RESERVED_BYTE;\r
\r
// Populate the flags\r
- ProcStruct->Flags.PhysicalPackage = ProcInfoNode->Flags & BIT0;\r
- ProcStruct->Flags.AcpiProcessorIdValid = (ProcInfoNode->Flags & BIT1) >> 1;\r
- ProcStruct->Flags.ProcessorIsAThread = (ProcInfoNode->Flags & BIT2) >> 2;\r
- ProcStruct->Flags.NodeIsALeaf = (ProcInfoNode->Flags & BIT3) >> 3;\r
+ ProcStruct->Flags.PhysicalPackage = ProcInfoNode->Flags & BIT0;\r
+ ProcStruct->Flags.AcpiProcessorIdValid = (ProcInfoNode->Flags & BIT1) >> 1;\r
+ ProcStruct->Flags.ProcessorIsAThread = (ProcInfoNode->Flags & BIT2) >> 2;\r
+ ProcStruct->Flags.NodeIsALeaf = (ProcInfoNode->Flags & BIT3) >> 3;\r
ProcStruct->Flags.IdenticalImplementation =\r
(ProcInfoNode->Flags & BIT4) >> 4;\r
ProcStruct->Flags.Reserved = 0;\r
\r
// Test if the reference is to a 'leaf' node\r
if (IS_PROC_NODE_LEAF (\r
- ((CM_ARM_PROC_HIERARCHY_INFO*)PpttNodeFound->Object))) {\r
+ ((CM_ARM_PROC_HIERARCHY_INFO *)PpttNodeFound->Object)\r
+ ))\r
+ {\r
Status = EFI_INVALID_PARAMETER;\r
DEBUG ((\r
DEBUG_ERROR,\r
}\r
\r
ProcStruct->NumberOfPrivateResources = ProcInfoNode->NoOfPrivateResources;\r
- PrivateResources = (UINT32*)((UINT8*)ProcStruct +\r
- sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR));\r
+ PrivateResources = (UINT32 *)((UINT8 *)ProcStruct +\r
+ sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR));\r
\r
if (ProcStruct->NumberOfPrivateResources != 0) {\r
// Populate the private resources array\r
Status = AddPrivateResources (\r
- Generator,\r
- CfgMgrProtocol,\r
- PrivateResources,\r
- ProcStruct->NumberOfPrivateResources,\r
- ProcInfoNode->PrivateResourcesArrayToken\r
- );\r
+ Generator,\r
+ CfgMgrProtocol,\r
+ PrivateResources,\r
+ ProcStruct->NumberOfPrivateResources,\r
+ ProcInfoNode->PrivateResourcesArrayToken\r
+ );\r
if (EFI_ERROR (Status)) {\r
DEBUG ((\r
DEBUG_ERROR,\r
}\r
\r
// Next Processor Hierarchy Node\r
- ProcStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR*)((UINT8*)ProcStruct +\r
- ProcStruct->Length);\r
+ ProcStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR *)((UINT8 *)ProcStruct +\r
+ ProcStruct->Length);\r
ProcNodeIterator++;\r
} // Processor Hierarchy Node\r
\r
STATIC\r
EFI_STATUS\r
AddCacheTypeStructures (\r
- IN CONST ACPI_PPTT_GENERATOR * CONST Generator,\r
- IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol,\r
- IN CONST EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt,\r
- IN CONST UINT32 NodesStartOffset\r
+ IN CONST ACPI_PPTT_GENERATOR *CONST Generator,\r
+ IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,\r
+ IN CONST EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER *Pptt,\r
+ IN CONST UINT32 NodesStartOffset\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE * CacheStruct;\r
- PPTT_NODE_INDEXER * PpttNodeFound;\r
- CM_ARM_CACHE_INFO * CacheInfoNode;\r
- PPTT_NODE_INDEXER * CacheNodeIterator;\r
- UINT32 NodeCount;\r
+ EFI_STATUS Status;\r
+ EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE *CacheStruct;\r
+ PPTT_NODE_INDEXER *PpttNodeFound;\r
+ CM_ARM_CACHE_INFO *CacheInfoNode;\r
+ PPTT_NODE_INDEXER *CacheNodeIterator;\r
+ UINT32 NodeCount;\r
\r
ASSERT (\r
(Generator != NULL) &&\r
(Pptt != NULL)\r
);\r
\r
- CacheStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE*)((UINT8*)Pptt +\r
- NodesStartOffset);\r
+ CacheStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE *)((UINT8 *)Pptt +\r
+ NodesStartOffset);\r
\r
CacheNodeIterator = Generator->CacheStructIndexedList;\r
- NodeCount = Generator->CacheStructCount;\r
+ NodeCount = Generator->CacheStructCount;\r
\r
while (NodeCount-- != 0) {\r
- CacheInfoNode = (CM_ARM_CACHE_INFO*)CacheNodeIterator->Object;\r
+ CacheInfoNode = (CM_ARM_CACHE_INFO *)CacheNodeIterator->Object;\r
\r
// Populate the node header\r
- CacheStruct->Type = EFI_ACPI_6_3_PPTT_TYPE_CACHE;\r
- CacheStruct->Length = sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE);\r
+ CacheStruct->Type = EFI_ACPI_6_3_PPTT_TYPE_CACHE;\r
+ CacheStruct->Length = sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE);\r
CacheStruct->Reserved[0] = EFI_ACPI_RESERVED_BYTE;\r
CacheStruct->Reserved[1] = EFI_ACPI_RESERVED_BYTE;\r
\r
// "On Arm-based systems, all cache properties must be provided in the\r
// table." (ACPI 6.3, Section 5.2.29.2)\r
- CacheStruct->Flags.SizePropertyValid = 1;\r
- CacheStruct->Flags.NumberOfSetsValid = 1;\r
- CacheStruct->Flags.AssociativityValid = 1;\r
+ CacheStruct->Flags.SizePropertyValid = 1;\r
+ CacheStruct->Flags.NumberOfSetsValid = 1;\r
+ CacheStruct->Flags.AssociativityValid = 1;\r
CacheStruct->Flags.AllocationTypeValid = 1;\r
- CacheStruct->Flags.CacheTypeValid = 1;\r
- CacheStruct->Flags.WritePolicyValid = 1;\r
- CacheStruct->Flags.LineSizeValid = 1;\r
- CacheStruct->Flags.Reserved = 0;\r
+ CacheStruct->Flags.CacheTypeValid = 1;\r
+ CacheStruct->Flags.WritePolicyValid = 1;\r
+ CacheStruct->Flags.LineSizeValid = 1;\r
+ CacheStruct->Flags.Reserved = 0;\r
\r
// Populate the reference to the next level of cache\r
if (CacheInfoNode->NextLevelOfCacheToken == CM_NULL_TOKEN) {\r
// current ACPI specification.\r
// These checks will be needed in the future when the ACPI specification\r
// is extended. Disabling this code for now.\r
-#if 0\r
+ #if 0\r
if (CacheInfoNode->Associativity > PPTT_ARM_CCIDX_CACHE_ASSOCIATIVITY_MAX) {\r
Status = EFI_INVALID_PARAMETER;\r
DEBUG ((\r
CacheInfoNode->Associativity\r
));\r
}\r
-#endif\r
+\r
+ #endif\r
\r
// Note a typecast is needed as the maximum associativity\r
// supported by ACPI Cache type structure is MAX_UINT8.\r
\r
// Validate and populate cache line size\r
if ((CacheInfoNode->LineSize < PPTT_ARM_CACHE_LINE_SIZE_MIN) ||\r
- (CacheInfoNode->LineSize > PPTT_ARM_CACHE_LINE_SIZE_MAX)) {\r
-\r
+ (CacheInfoNode->LineSize > PPTT_ARM_CACHE_LINE_SIZE_MAX))\r
+ {\r
Status = EFI_INVALID_PARAMETER;\r
DEBUG ((\r
DEBUG_ERROR,\r
"ERROR: PPTT: The cache line size must be between %d and %d bytes " \\r
- "on ARM Platforms. LineSize = %d. Status = %r\n" ,\r
+ "on ARM Platforms. LineSize = %d. Status = %r\n",\r
PPTT_ARM_CACHE_LINE_SIZE_MIN,\r
PPTT_ARM_CACHE_LINE_SIZE_MAX,\r
CacheInfoNode->LineSize,\r
DEBUG ((\r
DEBUG_ERROR,\r
"ERROR: PPTT: The cache line size is not a power of 2. " \\r
- "LineSize = %d. Status = %r\n" ,\r
+ "LineSize = %d. Status = %r\n",\r
CacheInfoNode->LineSize,\r
Status\r
));\r
CacheStruct->LineSize = CacheInfoNode->LineSize;\r
\r
// Next Cache Type Structure\r
- CacheStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE*)((UINT8*)CacheStruct +\r
- CacheStruct->Length);\r
+ CacheStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE *)((UINT8 *)CacheStruct +\r
+ CacheStruct->Length);\r
CacheNodeIterator++;\r
} // Cache Type Structure\r
\r
STATIC\r
EFI_STATUS\r
AddIdTypeStructures (\r
- IN CONST ACPI_PPTT_GENERATOR * CONST Generator,\r
- IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol,\r
- IN CONST EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt,\r
- IN CONST UINT32 NodesStartOffset\r
+ IN CONST ACPI_PPTT_GENERATOR *CONST Generator,\r
+ IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,\r
+ IN CONST EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER *Pptt,\r
+ IN CONST UINT32 NodesStartOffset\r
)\r
{\r
- EFI_ACPI_6_3_PPTT_STRUCTURE_ID * IdStruct;\r
- CM_ARM_PROC_NODE_ID_INFO * ProcIdInfoNode;\r
- PPTT_NODE_INDEXER * IdStructIterator;\r
- UINT32 NodeCount;\r
-\r
+ EFI_ACPI_6_3_PPTT_STRUCTURE_ID *IdStruct;\r
+ CM_ARM_PROC_NODE_ID_INFO *ProcIdInfoNode;\r
+ PPTT_NODE_INDEXER *IdStructIterator;\r
+ UINT32 NodeCount;\r
\r
ASSERT (\r
(Generator != NULL) &&\r
(Pptt != NULL)\r
);\r
\r
- IdStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_ID*)((UINT8*)Pptt + NodesStartOffset);\r
+ IdStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_ID *)((UINT8 *)Pptt + NodesStartOffset);\r
\r
IdStructIterator = Generator->IdStructIndexedList;\r
- NodeCount = Generator->IdStructCount;\r
+ NodeCount = Generator->IdStructCount;\r
while (NodeCount-- != 0) {\r
- ProcIdInfoNode = (CM_ARM_PROC_NODE_ID_INFO*)IdStructIterator->Object;\r
+ ProcIdInfoNode = (CM_ARM_PROC_NODE_ID_INFO *)IdStructIterator->Object;\r
\r
// Populate the node\r
- IdStruct->Type = EFI_ACPI_6_3_PPTT_TYPE_ID;\r
- IdStruct->Length = sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_ID);\r
+ IdStruct->Type = EFI_ACPI_6_3_PPTT_TYPE_ID;\r
+ IdStruct->Length = sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_ID);\r
IdStruct->Reserved[0] = EFI_ACPI_RESERVED_BYTE;\r
IdStruct->Reserved[1] = EFI_ACPI_RESERVED_BYTE;\r
- IdStruct->VendorId = ProcIdInfoNode->VendorId;\r
- IdStruct->Level1Id = ProcIdInfoNode->Level1Id;\r
- IdStruct->Level2Id = ProcIdInfoNode->Level2Id;\r
- IdStruct->MajorRev = ProcIdInfoNode->MajorRev;\r
- IdStruct->MinorRev = ProcIdInfoNode->MinorRev;\r
- IdStruct->SpinRev = ProcIdInfoNode->SpinRev;\r
+ IdStruct->VendorId = ProcIdInfoNode->VendorId;\r
+ IdStruct->Level1Id = ProcIdInfoNode->Level1Id;\r
+ IdStruct->Level2Id = ProcIdInfoNode->Level2Id;\r
+ IdStruct->MajorRev = ProcIdInfoNode->MajorRev;\r
+ IdStruct->MinorRev = ProcIdInfoNode->MinorRev;\r
+ IdStruct->SpinRev = ProcIdInfoNode->SpinRev;\r
\r
// Next ID Type Structure\r
- IdStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_ID*)((UINT8*)IdStruct +\r
- IdStruct->Length);\r
+ IdStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_ID *)((UINT8 *)IdStruct +\r
+ IdStruct->Length);\r
IdStructIterator++;\r
} // ID Type Structure\r
\r
EFI_STATUS\r
EFIAPI\r
BuildPpttTable (\r
- IN CONST ACPI_TABLE_GENERATOR * CONST This,\r
- IN CONST CM_STD_OBJ_ACPI_TABLE_INFO * CONST AcpiTableInfo,\r
- IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol,\r
- OUT EFI_ACPI_DESCRIPTION_HEADER ** CONST Table\r
+ IN CONST ACPI_TABLE_GENERATOR *CONST This,\r
+ IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,\r
+ IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,\r
+ OUT EFI_ACPI_DESCRIPTION_HEADER **CONST Table\r
)\r
{\r
- EFI_STATUS Status;\r
- UINT32 TableSize;\r
- UINT32 ProcTopologyStructCount;\r
- UINT32 ProcHierarchyNodeCount;\r
- UINT32 CacheStructCount;\r
- UINT32 IdStructCount;\r
+ EFI_STATUS Status;\r
+ UINT32 TableSize;\r
+ UINT32 ProcTopologyStructCount;\r
+ UINT32 ProcHierarchyNodeCount;\r
+ UINT32 CacheStructCount;\r
+ UINT32 IdStructCount;\r
\r
- UINT32 ProcHierarchyNodeOffset;\r
- UINT32 CacheStructOffset;\r
- UINT32 IdStructOffset;\r
+ UINT32 ProcHierarchyNodeOffset;\r
+ UINT32 CacheStructOffset;\r
+ UINT32 IdStructOffset;\r
\r
- CM_ARM_PROC_HIERARCHY_INFO * ProcHierarchyNodeList;\r
- CM_ARM_CACHE_INFO * CacheStructList;\r
- CM_ARM_PROC_NODE_ID_INFO * IdStructList;\r
+ CM_ARM_PROC_HIERARCHY_INFO *ProcHierarchyNodeList;\r
+ CM_ARM_CACHE_INFO *CacheStructList;\r
+ CM_ARM_PROC_NODE_ID_INFO *IdStructList;\r
\r
- ACPI_PPTT_GENERATOR * Generator;\r
+ ACPI_PPTT_GENERATOR *Generator;\r
\r
// Pointer to the Node Indexer array\r
- PPTT_NODE_INDEXER * NodeIndexer;\r
+ PPTT_NODE_INDEXER *NodeIndexer;\r
\r
- EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt;\r
+ EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER *Pptt;\r
\r
ASSERT (\r
(This != NULL) &&\r
);\r
\r
if ((AcpiTableInfo->AcpiTableRevision < This->MinAcpiTableRevision) ||\r
- (AcpiTableInfo->AcpiTableRevision > This->AcpiTableRevision)) {\r
+ (AcpiTableInfo->AcpiTableRevision > This->AcpiTableRevision))\r
+ {\r
DEBUG ((\r
DEBUG_ERROR,\r
"ERROR: PPTT: Requested table revision = %d is not supported. "\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- Generator = (ACPI_PPTT_GENERATOR*)This;\r
- *Table = NULL;\r
+ Generator = (ACPI_PPTT_GENERATOR *)This;\r
+ *Table = NULL;\r
\r
// Get the processor hierarchy info and update the processor topology\r
// structure count with Processor Hierarchy Nodes (Type 0)\r
goto error_handler;\r
}\r
\r
- ProcTopologyStructCount = ProcHierarchyNodeCount;\r
+ ProcTopologyStructCount = ProcHierarchyNodeCount;\r
Generator->ProcHierarchyNodeCount = ProcHierarchyNodeCount;\r
\r
// Get the cache info and update the processor topology structure count with\r
goto error_handler;\r
}\r
\r
- ProcTopologyStructCount += CacheStructCount;\r
+ ProcTopologyStructCount += CacheStructCount;\r
Generator->CacheStructCount = CacheStructCount;\r
\r
// Get the processor hierarchy node ID info and update the processor topology\r
Generator->IdStructCount = IdStructCount;\r
\r
// Allocate Node Indexer array\r
- NodeIndexer = (PPTT_NODE_INDEXER*)AllocateZeroPool (\r
- sizeof (PPTT_NODE_INDEXER) *\r
- ProcTopologyStructCount\r
- );\r
+ NodeIndexer = (PPTT_NODE_INDEXER *)AllocateZeroPool (\r
+ sizeof (PPTT_NODE_INDEXER) *\r
+ ProcTopologyStructCount\r
+ );\r
if (NodeIndexer == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
DEBUG ((\r
\r
DEBUG ((DEBUG_INFO, "INFO: NodeIndexer = %p\n", NodeIndexer));\r
Generator->ProcTopologyStructCount = ProcTopologyStructCount;\r
- Generator->NodeIndexer = NodeIndexer;\r
+ Generator->NodeIndexer = NodeIndexer;\r
\r
// Calculate the size of the PPTT table\r
TableSize = sizeof (EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER);\r
\r
// Include the size of Processor Hierarchy Nodes and index them\r
if (Generator->ProcHierarchyNodeCount != 0) {\r
- ProcHierarchyNodeOffset = TableSize;\r
+ ProcHierarchyNodeOffset = TableSize;\r
Generator->ProcHierarchyNodeIndexedList = NodeIndexer;\r
- TableSize += GetSizeofProcHierarchyNodes (\r
- ProcHierarchyNodeOffset,\r
- ProcHierarchyNodeList,\r
- Generator->ProcHierarchyNodeCount,\r
- &NodeIndexer\r
- );\r
+ TableSize += GetSizeofProcHierarchyNodes (\r
+ ProcHierarchyNodeOffset,\r
+ ProcHierarchyNodeList,\r
+ Generator->ProcHierarchyNodeCount,\r
+ &NodeIndexer\r
+ );\r
\r
DEBUG ((\r
DEBUG_INFO,\r
ProcHierarchyNodeOffset,\r
Generator->ProcHierarchyNodeIndexedList\r
));\r
-\r
}\r
\r
// Include the size of Cache Type Structures and index them\r
if (Generator->CacheStructCount != 0) {\r
- CacheStructOffset = TableSize;\r
+ CacheStructOffset = TableSize;\r
Generator->CacheStructIndexedList = NodeIndexer;\r
- TableSize += GetSizeofCacheTypeStructs (\r
- CacheStructOffset,\r
- CacheStructList,\r
- Generator->CacheStructCount,\r
- &NodeIndexer\r
- );\r
+ TableSize += GetSizeofCacheTypeStructs (\r
+ CacheStructOffset,\r
+ CacheStructList,\r
+ Generator->CacheStructCount,\r
+ &NodeIndexer\r
+ );\r
DEBUG ((\r
DEBUG_INFO,\r
" CacheStructCount = %d\n" \\r
\r
// Include the size of ID Type Structures and index them\r
if (Generator->IdStructCount != 0) {\r
- IdStructOffset = TableSize;\r
+ IdStructOffset = TableSize;\r
Generator->IdStructIndexedList = NodeIndexer;\r
- TableSize += GetSizeofIdStructs (\r
- IdStructOffset,\r
- IdStructList,\r
- Generator->IdStructCount,\r
- &NodeIndexer\r
- );\r
+ TableSize += GetSizeofIdStructs (\r
+ IdStructOffset,\r
+ IdStructList,\r
+ Generator->IdStructCount,\r
+ &NodeIndexer\r
+ );\r
DEBUG ((\r
DEBUG_INFO,\r
" IdStructCount = %d\n" \\r
));\r
\r
// Allocate the Buffer for the PPTT table\r
- *Table = (EFI_ACPI_DESCRIPTION_HEADER*)AllocateZeroPool (TableSize);\r
+ *Table = (EFI_ACPI_DESCRIPTION_HEADER *)AllocateZeroPool (TableSize);\r
if (*Table == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
DEBUG ((\r
goto error_handler;\r
}\r
\r
- Pptt = (EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER*)*Table;\r
+ Pptt = (EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER *)*Table;\r
\r
DEBUG ((\r
DEBUG_INFO,\r
STATIC\r
EFI_STATUS\r
FreePpttTableResources (\r
- IN CONST ACPI_TABLE_GENERATOR * CONST This,\r
- IN CONST CM_STD_OBJ_ACPI_TABLE_INFO * CONST AcpiTableInfo,\r
- IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol,\r
- IN OUT EFI_ACPI_DESCRIPTION_HEADER ** CONST Table\r
+ IN CONST ACPI_TABLE_GENERATOR *CONST This,\r
+ IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo,\r
+ IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol,\r
+ IN OUT EFI_ACPI_DESCRIPTION_HEADER **CONST Table\r
)\r
{\r
- ACPI_PPTT_GENERATOR * Generator;\r
+ ACPI_PPTT_GENERATOR *Generator;\r
\r
ASSERT (\r
(This != NULL) &&\r
(AcpiTableInfo->AcpiTableSignature == This->AcpiTableSignature)\r
);\r
\r
- Generator = (ACPI_PPTT_GENERATOR*)This;\r
+ Generator = (ACPI_PPTT_GENERATOR *)This;\r
\r
// Free any memory allocated by the generator\r
if (Generator->NodeIndexer != NULL) {\r
\r
/** The PPTT Table Generator revision.\r
*/\r
-#define PPTT_GENERATOR_REVISION CREATE_REVISION (1, 0)\r
+#define PPTT_GENERATOR_REVISION CREATE_REVISION (1, 0)\r
\r
/** The interface for the PPTT Table Generator.\r
*/\r
STATIC\r
-ACPI_PPTT_GENERATOR PpttGenerator = {\r
+ACPI_PPTT_GENERATOR PpttGenerator = {\r
// ACPI table generator header\r
{\r
// Generator ID\r
EFI_STATUS\r
EFIAPI\r
AcpiPpttLibConstructor (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE * SystemTable\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
EFI_STATUS Status;\r
+\r
Status = RegisterAcpiTableGenerator (&PpttGenerator.Header);\r
DEBUG ((DEBUG_INFO, "PPTT: Register Generator. Status = %r\n", Status));\r
ASSERT_EFI_ERROR (Status);\r
EFI_STATUS\r
EFIAPI\r
AcpiPpttLibDestructor (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE * SystemTable\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
EFI_STATUS Status;\r
+\r
Status = DeregisterAcpiTableGenerator (&PpttGenerator.Header);\r
DEBUG ((DEBUG_INFO, "PPTT: Deregister Generator. Status = %r\n", Status));\r
ASSERT_EFI_ERROR (Status);\r
projects / mirror_edk2.git / blobdiff