Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers

Timestamp:

Apr 14, 2023 3:17:44 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156854

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Aest/AestParser.c (modified) (38 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Apmt (added)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Apmt/ApmtParser.c (added)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Bgrt/BgrtParser.c (modified) (2 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c (modified) (14 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dsdt/DsdtParser.c (modified) (3 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Erst (added)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Erst/ErstParser.c (added)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Facs/FacsParser.c (modified) (2 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c (modified) (13 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c (modified) (21 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Hmat/HmatParser.c (modified) (34 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c (modified) (36 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c (modified) (23 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.h (modified) (1 diff)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Mcfg/McfgParser.c (modified) (4 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.c (modified) (33 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.h (modified) (1 diff)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c (modified) (28 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.h (modified) (2 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rsdp/RsdpParser.c (modified) (11 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c (modified) (8 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Spcr/SpcrParser.c (modified) (7 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Srat/SratParser.c (modified) (23 diffs)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Ssdt/SsdtParser.c (modified) (1 diff)
• ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c (modified) (8 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Aest/AestParser.c

@@ -19 +19 @@
 
 // Local variables
-STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
-STATIC UINT8*                       AestNodeType;
-STATIC UINT16*                      AestNodeLength;
-STATIC UINT32*                      NodeDataOffset;
-STATIC UINT32*                      NodeInterfaceOffset;
-STATIC UINT32*                      NodeInterruptArrayOffset;
-STATIC UINT32*                      NodeInterruptCount;
-STATIC UINT32*                      ProcessorId;
-STATIC UINT8*                       ProcessorFlags;
-STATIC UINT8*                       ProcessorResourceType;
+STATIC ACPI_DESCRIPTION_HEADER_INFO  AcpiHdrInfo;
+STATIC UINT8                         *AestNodeType;
+STATIC UINT16                        *AestNodeLength;
+STATIC UINT32                        *NodeDataOffset;
+STATIC UINT32                        *NodeInterfaceOffset;
+STATIC UINT32                        *NodeInterruptArrayOffset;
+STATIC UINT32                        *NodeInterruptCount;
+STATIC UINT32                        *ProcessorId;
+STATIC UINT8                         *ProcessorFlags;
+STATIC UINT8                         *ProcessorResourceType;
 
 /**
@@ -41 +41 @@
 EFIAPI
 ValidateProcessorFlags (
-  IN UINT8* Ptr,
-  IN VOID*  Context
+  IN UINT8  *Ptr,
+  IN VOID   *Context
   )
 {
@@ -49 +49 @@
   if (((*Ptr & 0x3) != 0) && (*ProcessorId != 0)) {
     IncrementErrorCount ();
-    Print (L"\nERROR: 'ACPI Processor ID' field must be set to 0 for global"
-           L" or shared nodes.");
+    Print (
+      L"\nERROR: 'ACPI Processor ID' field must be set to 0 for global"
+      L" or shared nodes."
+      );
   }
 }
@@ -65 +67 @@
 EFIAPI
 ValidateGicInterfaceType (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-  )
-{
-  UINT32 GicInterfaceType;
-
-  GicInterfaceType = *(UINT32*)Ptr;
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  UINT32  GicInterfaceType;
+
+  GicInterfaceType = *(UINT32 *)Ptr;
   if (GicInterfaceType > 3) {
     IncrementErrorCount ();
@@ -89 +91 @@
 EFIAPI
 ValidateInterfaceType (
-  IN UINT8* Ptr,
-  IN VOID*  Context
+  IN UINT8  *Ptr,
+  IN VOID   *Context
   )
 {
@@ -110 +112 @@
 EFIAPI
 ValidateInterruptType (
-  IN UINT8* Ptr,
-  IN VOID*  Context
+  IN UINT8  *Ptr,
+  IN VOID   *Context
   )
 {
@@ -131 +133 @@
 EFIAPI
 ValidateInterruptFlags (
-  IN UINT8* Ptr,
-  IN VOID*  Context
+  IN UINT8  *Ptr,
+  IN VOID   *Context
   )
 {
@@ -150 +152 @@
 EFIAPI
 DumpVendorSpecificData (
-  IN CONST CHAR16* Format OPTIONAL,
-  IN UINT8*        Ptr
+  IN CONST CHAR16  *Format OPTIONAL,
+  IN UINT8         *Ptr
   )
 {
@@ -184 +186 @@
   An ACPI_PARSER array describing the ACPI AEST Table.
 **/
-STATIC CONST ACPI_PARSER AestParser[] = {
+STATIC CONST ACPI_PARSER  AestParser[] = {
   PARSE_ACPI_HEADER (&AcpiHdrInfo)
 };
@@ -191 +193 @@
   An ACPI_PARSER array describing the AEST Node Header.
 **/
-STATIC CONST ACPI_PARSER AestNodeHeaderParser[] = {
-  {L"Type", 1, 0, L"%d", NULL, (VOID**)&AestNodeType, NULL, NULL},
-  {L"Length", 2, 1, L"%d", NULL, (VOID**)&AestNodeLength, NULL, NULL},
-  {L"Reserved", 1, 3, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Node Data Offset", 4, 4, L"%d", NULL, (VOID**)&NodeDataOffset, NULL, NULL},
-  {L"Node Interface Offset", 4, 8, L"%d", NULL,
-    (VOID**)&NodeInterfaceOffset, NULL, NULL},
-  {L"Node Interrupt Array Offset", 4, 12, L"%d", NULL,
-    (VOID**)&NodeInterruptArrayOffset, NULL, NULL},
-  {L"Node Interrupt Count", 4, 16, L"%d", NULL,
-    (VOID**)&NodeInterruptCount, NULL, NULL},
-  {L"Timestamp Rate", 8, 20, L"%ld", NULL, NULL, NULL, NULL},
-  {L"Reserved1", 8, 28, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Error Injection Countdown Rate", 8, 36, L"%ld", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  AestNodeHeaderParser[] = {
+  { L"Type",                           1, 0,  L"%d",    NULL, (VOID **)&AestNodeType,   NULL, NULL },
+  { L"Length",                         2, 1,  L"%d",    NULL, (VOID **)&AestNodeLength, NULL, NULL },
+  { L"Reserved",                       1, 3,  L"0x%x",  NULL, NULL,                     NULL, NULL },
+  { L"Node Data Offset",               4, 4,  L"%d",    NULL, (VOID **)&NodeDataOffset, NULL, NULL },
+  { L"Node Interface Offset",          4, 8,  L"%d",    NULL,
+    (VOID **)&NodeInterfaceOffset, NULL, NULL },
+  { L"Node Interrupt Array Offset",    4, 12, L"%d",    NULL,
+    (VOID **)&NodeInterruptArrayOffset, NULL, NULL },
+  { L"Node Interrupt Count",           4, 16, L"%d",    NULL,
+    (VOID **)&NodeInterruptCount, NULL, NULL },
+  { L"Timestamp Rate",                 8, 20, L"%ld",   NULL, NULL,                     NULL, NULL },
+  { L"Reserved1",                      8, 28, L"0x%lx", NULL, NULL,                     NULL, NULL },
+  { L"Error Injection Countdown Rate", 8, 36, L"%ld",   NULL, NULL,                     NULL, NULL }
   // Node specific data...
   // Node interface...
@@ -213 +215 @@
   An ACPI_PARSER array describing the Processor error node specific data.
 **/
-STATIC CONST ACPI_PARSER AestProcessorStructure[] = {
-  {L"ACPI Processor ID", 4, 0, L"0x%x", NULL, (VOID**)&ProcessorId, NULL, NULL},
-  {L"Resource Type", 1, 4, L"%d", NULL, (VOID**)&ProcessorResourceType, NULL,
-    NULL},
-  {L"Reserved", 1, 5, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Flags", 1, 6, L"0x%x", NULL, (VOID**)&ProcessorFlags,
-    ValidateProcessorFlags, NULL},
-  {L"Revision", 1, 7, L"%d", NULL, NULL, NULL, NULL},
-  {L"Processor Affinity Level Indicator", 8, 8, L"0x%lx", NULL, NULL, NULL,
-    NULL},
+STATIC CONST ACPI_PARSER  AestProcessorStructure[] = {
+  { L"ACPI Processor ID",                  4, 0, L"0x%x",  NULL, (VOID **)&ProcessorId,           NULL, NULL },
+  { L"Resource Type",                      1, 4, L"%d",    NULL, (VOID **)&ProcessorResourceType, NULL,
+    NULL },
+  { L"Reserved",                           1, 5, L"0x%x",  NULL, NULL,                            NULL, NULL },
+  { L"Flags",                              1, 6, L"0x%x",  NULL, (VOID **)&ProcessorFlags,
+    ValidateProcessorFlags, NULL },
+  { L"Revision",                           1, 7, L"%d",    NULL, NULL,                            NULL, NULL },
+  { L"Processor Affinity Level Indicator", 8, 8, L"0x%lx", NULL, NULL,                            NULL,
+    NULL },
   // Resource specific data...
 };
@@ -229 +231 @@
   An ACPI_PARSER array describing the processor cache resource substructure.
 **/
-STATIC CONST ACPI_PARSER AestProcessorCacheResourceSubstructure[] = {
-  {L"Cache reference ID", 4, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 4, 4, L"%d", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  AestProcessorCacheResourceSubstructure[] = {
+  { L"Cache reference ID", 4, 0, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Reserved",           4, 4, L"%d",   NULL, NULL, NULL, NULL }
 };
 
@@ -237 +239 @@
   An ACPI_PARSER array describing the processor TLB resource substructure.
 **/
-STATIC CONST ACPI_PARSER AestProcessorTlbResourceSubstructure[] = {
-  {L"TLB reference ID", 4, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 4, 4, L"%d", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  AestProcessorTlbResourceSubstructure[] = {
+  { L"TLB reference ID", 4, 0, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Reserved",         4, 4, L"%d",   NULL, NULL, NULL, NULL }
 };
 
@@ -245 +247 @@
   An ACPI_PARSER array describing the processor generic resource substructure.
 **/
-STATIC CONST ACPI_PARSER AestProcessorGenericResourceSubstructure[] = {
-  {L"Vendor-defined data", 4, 0, L"%x", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  AestProcessorGenericResourceSubstructure[] = {
+  { L"Vendor-defined data", 4, 0, L"%x", NULL, NULL, NULL, NULL }
 };
 
@@ -252 +254 @@
   An ACPI_PARSER array describing the memory controller structure.
 **/
-STATIC CONST ACPI_PARSER AestMemoryControllerStructure[] = {
-  {L"Proximity Domain", 4, 0, L"0x%x", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  AestMemoryControllerStructure[] = {
+  { L"Proximity Domain", 4, 0, L"0x%x", NULL, NULL, NULL, NULL }
 };
 
@@ -259 +261 @@
   An ACPI_PARSER array describing the SMMU structure.
 **/
-STATIC CONST ACPI_PARSER AestSmmuStructure[] = {
-  {L"IORT Node reference ID", 4, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"SubComponent reference ID", 4, 4, L"0x%x", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  AestSmmuStructure[] = {
+  { L"IORT Node reference ID",    4, 0, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"SubComponent reference ID", 4, 4, L"0x%x", NULL, NULL, NULL, NULL }
 };
 
@@ -267 +269 @@
   An ACPI_PARSER array describing the vendor-defined structure.
 **/
-STATIC CONST ACPI_PARSER AestVendorDefinedStructure[] = {
-  {L"Hardware ID", 4, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Unique ID", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Vendor-specific data", 16, 8, NULL, DumpVendorSpecificData, NULL, NULL}
+STATIC CONST ACPI_PARSER  AestVendorDefinedStructure[] = {
+  { L"Hardware ID",          4,  0, L"0x%x", NULL,                   NULL, NULL, NULL },
+  { L"Unique ID",            4,  4, L"0x%x", NULL,                   NULL, NULL, NULL },
+  { L"Vendor-specific data", 16, 8, NULL,    DumpVendorSpecificData, NULL, NULL }
 };
 
@@ -276 +278 @@
   An ACPI_PARSER array describing the GIC structure.
 **/
-STATIC CONST ACPI_PARSER AestGicStructure[] = {
-  {L"GIC Interface Type", 4, 0, L"0x%x", NULL, NULL, ValidateGicInterfaceType,
-    NULL},
-  {L"GIC Interface reference ID", 4, 4, L"0x%x", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  AestGicStructure[] = {
+  { L"GIC Interface Type",         4, 0, L"0x%x", NULL, NULL, ValidateGicInterfaceType,
+    NULL },
+  { L"GIC Interface reference ID", 4, 4, L"0x%x", NULL, NULL, NULL,                    NULL}
 };
 
@@ -285 +287 @@
   An ACPI_PARSER array describing the node interface.
 **/
-STATIC CONST ACPI_PARSER AestNodeInterface[] = {
-  {L"Interface Type", 1, 0, L"%d", NULL, NULL, ValidateInterfaceType, NULL},
-  {L"Reserved", 3, 1, L"%x %x %x", Dump3Chars, NULL, NULL, NULL},
-  {L"Flags", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Base Address", 8, 8, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Start Error Record Index", 4, 16, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Number of Error Records", 4, 20, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Error Records Implemented", 8, 24, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Error Records Support", 8, 32, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Addressing mode", 8, 40, L"0x%lx", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  AestNodeInterface[] = {
+  { L"Interface Type",            1, 0,  L"%d",       NULL,       NULL, ValidateInterfaceType, NULL },
+  { L"Reserved",                  3, 1,  L"%x %x %x", Dump3Chars, NULL, NULL,                  NULL },
+  { L"Flags",                     4, 4,  L"0x%x",     NULL,       NULL, NULL,                  NULL },
+  { L"Base Address",              8, 8,  L"0x%lx",    NULL,       NULL, NULL,                  NULL },
+  { L"Start Error Record Index",  4, 16, L"0x%x",     NULL,       NULL, NULL,                  NULL },
+  { L"Number of Error Records",   4, 20, L"0x%x",     NULL,       NULL, NULL,                  NULL },
+  { L"Error Records Implemented", 8, 24, L"0x%lx",    NULL,       NULL, NULL,                  NULL },
+  { L"Error Records Support",     8, 32, L"0x%lx",    NULL,       NULL, NULL,                  NULL },
+  { L"Addressing mode",           8, 40, L"0x%lx",    NULL,       NULL, NULL,                  NULL }
 };
 
@@ -300 +302 @@
   An ACPI_PARSER array describing the node interrupts.
 **/
-STATIC CONST ACPI_PARSER AestNodeInterrupt[] = {
-  {L"Interrupt Type", 1, 0, L"%d", NULL, NULL, ValidateInterruptType, NULL},
-  {L"Reserved", 2, 1, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Interrupt Flags", 1, 3, L"0x%x", NULL, NULL, ValidateInterruptFlags, NULL},
-  {L"Interrupt GSIV", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"ID", 1, 8, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved1", 3, 9, L"%x %x %x", Dump3Chars, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  AestNodeInterrupt[] = {
+  { L"Interrupt Type",  1, 0, L"%d",       NULL,       NULL, ValidateInterruptType,  NULL },
+  { L"Reserved",        2, 1, L"0x%x",     NULL,       NULL, NULL,                   NULL },
+  { L"Interrupt Flags", 1, 3, L"0x%x",     NULL,       NULL, ValidateInterruptFlags, NULL },
+  { L"Interrupt GSIV",  4, 4, L"0x%x",     NULL,       NULL, NULL,                   NULL },
+  { L"ID",              1, 8, L"0x%x",     NULL,       NULL, NULL,                   NULL },
+  { L"Reserved1",       3, 9, L"%x %x %x", Dump3Chars, NULL, NULL,                   NULL }
 };
 
@@ -319 +321 @@
 VOID
 DumpProcessorNode (
-  IN UINT8* Ptr,
-  IN UINT32 Length
-  )
-{
-  UINT32 Offset;
+  IN UINT8   *Ptr,
+  IN UINT32  Length
+  )
+{
+  UINT32  Offset;
 
   Offset = ParseAcpi (
@@ -338 +340 @@
   if ((ProcessorId == NULL)           ||
       (ProcessorResourceType == NULL) ||
-      (ProcessorFlags == NULL)) {
+      (ProcessorFlags == NULL))
+  {
     IncrementErrorCount ();
     Print (
@@ -394 +397 @@
 VOID
 DumpMemoryControllerNode (
-  IN UINT8* Ptr,
-  IN UINT32 Length
+  IN UINT8   *Ptr,
+  IN UINT32  Length
   )
 {
@@ -417 +420 @@
 VOID
 DumpSmmuNode (
-  IN UINT8* Ptr,
-  IN UINT32 Length
+  IN UINT8   *Ptr,
+  IN UINT32  Length
   )
 {
@@ -440 +443 @@
 VOID
 DumpVendorDefinedNode (
-  IN UINT8* Ptr,
-  IN UINT32 Length
+  IN UINT8   *Ptr,
+  IN UINT32  Length
   )
 {
@@ -463 +466 @@
 VOID
 DumpGicNode (
-  IN UINT8* Ptr,
-  IN UINT32 Length
+  IN UINT8   *Ptr,
+  IN UINT32  Length
   )
 {
@@ -486 +489 @@
 VOID
 DumpNodeInterface (
-  IN UINT8* Ptr,
-  IN UINT32 Length
+  IN UINT8   *Ptr,
+  IN UINT32  Length
   )
 {
@@ -510 +513 @@
 VOID
 DumpNodeInterrupts (
-  IN UINT8* Ptr,
-  IN UINT32 Length,
-  IN UINT32 InterruptCount
-  )
-{
-  UINT32 Offset;
-  UINT32 Index;
-  CHAR8  Buffer[64];
+  IN UINT8   *Ptr,
+  IN UINT32  Length,
+  IN UINT32  InterruptCount
+  )
+{
+  UINT32  Offset;
+  UINT32  Index;
+  CHAR8   Buffer[64];
 
   if (Length < (InterruptCount * sizeof (EFI_ACPI_AEST_INTERRUPT_STRUCT))) {
     IncrementErrorCount ();
     Print (
-      L"ERROR: Node not long enough for Interrupt Array.\n"\
+      L"ERROR: Node not long enough for Interrupt Array.\n" \
       L"       Length left = %d, Required = %d, Interrupt Count = %d\n",
       Length,
@@ -548 +551 @@
                 PARSER_PARAMS (AestNodeInterrupt)
                 );
-  } //for
+  } // for
 }
 
@@ -565 +568 @@
 VOID
 DumpAestNodeStructure (
-  IN UINT8*  Ptr,
+  IN UINT8   *Ptr,
   IN UINT32  Length,
   IN UINT8   NodeType,
@@ -574 +577 @@
   )
 {
-  UINT32 Offset;
-  UINT32 RemainingLength;
-  UINT8* NodeDataPtr;
+  UINT32  Offset;
+  UINT32  RemainingLength;
+  UINT8   *NodeDataPtr;
 
   Offset = ParseAcpi (
@@ -590 +593 @@
     IncrementErrorCount ();
     Print (
-      L"ERROR: Invalid Node Data Offset: %d.\n"\
+      L"ERROR: Invalid Node Data Offset: %d.\n" \
       L"       It should be between %d and %d.\n",
       DataOffset,
@@ -601 +604 @@
     IncrementErrorCount ();
     Print (
-      L"ERROR: Invalid Node Interface Offset: %d.\n"\
+      L"ERROR: Invalid Node Interface Offset: %d.\n" \
       L"       It should be between %d and %d.\n",
       InterfaceOffset,
@@ -612 +615 @@
     IncrementErrorCount ();
     Print (
-      L"ERROR: Invalid Node Interrupt Array Offset: %d.\n"\
+      L"ERROR: Invalid Node Interrupt Array Offset: %d.\n" \
       L"       It should be between %d and %d.\n",
       InterruptArrayOffset,
@@ -621 +624 @@
 
   // Parse Node Data Field.
-  NodeDataPtr = Ptr + DataOffset;
+  NodeDataPtr     = Ptr + DataOffset;
   RemainingLength = Length - DataOffset;
   switch (NodeType) {
@@ -676 +679 @@
 EFIAPI
 ParseAcpiAest (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
   )
 {
   UINT32  Offset;
-  UINT8*  NodePtr;
+  UINT8   *NodePtr;
 
   if (!Trace) {
@@ -717 +720 @@
         (NodeInterfaceOffset == NULL)      ||
         (NodeInterruptArrayOffset == NULL) ||
-        (NodeInterruptCount == NULL)) {
+        (NodeInterruptCount == NULL))
+    {
       IncrementErrorCount ();
       Print (
-        L"ERROR: Insufficient length left for Node Structure.\n"\
+        L"ERROR: Insufficient length left for Node Structure.\n" \
         L"       Length left = %d.\n",
         AcpiTableLength - Offset
@@ -729 +733 @@
     // Validate AEST Node length
     if ((*AestNodeLength == 0) ||
-        ((Offset + (*AestNodeLength)) > AcpiTableLength)) {
+        ((Offset + (*AestNodeLength)) > AcpiTableLength))
+    {
       IncrementErrorCount ();
       Print (
         L"ERROR: Invalid AEST Node length. " \
-          L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
+        L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
         *AestNodeLength,
         Offset,

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Bgrt/BgrtParser.c

@@ -15 +15 @@
 
 // Local variables
-STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
+STATIC ACPI_DESCRIPTION_HEADER_INFO  AcpiHdrInfo;
 
 /**
   An ACPI_PARSER array describing the ACPI BDRT Table.
 **/
-STATIC CONST ACPI_PARSER BgrtParser[] = {
+STATIC CONST ACPI_PARSER  BgrtParser[] = {
   PARSE_ACPI_HEADER (&AcpiHdrInfo),
-  {L"Version", 2, 36, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Status", 1, 38, L"0x%x", NULL,  NULL, NULL, NULL},
-  {L"Image Type", 1, 39, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Image Address", 8, 40, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Image Offset X", 4, 48, L"%d", NULL, NULL, NULL, NULL},
-  {L"Image Offset Y", 4, 52, L"%d", NULL, NULL, NULL, NULL}
+  { L"Version",                    2,  36, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Status",                     1,  38, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Image Type",                 1,  39, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Image Address",              8,  40, L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"Image Offset X",             4,  48, L"%d",    NULL, NULL, NULL, NULL },
+  { L"Image Offset Y",             4,  52, L"%d",    NULL, NULL, NULL, NULL }
 };
 
@@ -45 +45 @@
 EFIAPI
 ParseAcpiBgrt (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
   )
 {

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c

@@ -15 +15 @@
 
 // Local variables pointing to the table fields
-STATIC CONST UINT32* OffsetDbgDeviceInfo;
-STATIC CONST UINT32* NumberDbgDeviceInfo;
-STATIC CONST UINT16* DbgDevInfoLen;
-STATIC CONST UINT8*  GasCount;
-STATIC CONST UINT16* NameSpaceStringLength;
-STATIC CONST UINT16* NameSpaceStringOffset;
-STATIC CONST UINT16* OEMDataLength;
-STATIC CONST UINT16* OEMDataOffset;
-STATIC CONST UINT16* BaseAddrRegOffset;
-STATIC CONST UINT16* AddrSizeOffset;
-STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
+STATIC CONST UINT32                  *OffsetDbgDeviceInfo;
+STATIC CONST UINT32                  *NumberDbgDeviceInfo;
+STATIC CONST UINT16                  *DbgDevInfoLen;
+STATIC CONST UINT8                   *GasCount;
+STATIC CONST UINT16                  *NameSpaceStringLength;
+STATIC CONST UINT16                  *NameSpaceStringOffset;
+STATIC CONST UINT16                  *OEMDataLength;
+STATIC CONST UINT16                  *OEMDataOffset;
+STATIC CONST UINT16                  *BaseAddrRegOffset;
+STATIC CONST UINT16                  *AddrSizeOffset;
+STATIC ACPI_DESCRIPTION_HEADER_INFO  AcpiHdrInfo;
 
 /**
@@ -38 +38 @@
 EFIAPI
 ValidateNameSpaceStrLen (
-  IN UINT8* Ptr,
-  IN VOID*  Context
+  IN UINT8  *Ptr,
+  IN VOID   *Context
   )
 {
-  UINT16 NameSpaceStrLen;
-
-  NameSpaceStrLen = *(UINT16*)Ptr;
+  UINT16  NameSpaceStrLen;
+
+  NameSpaceStrLen = *(UINT16 *)Ptr;
 
   if (NameSpaceStrLen < 2) {
@@ -50 +50 @@
     Print (
       L"\nERROR: NamespaceString Length = %d. If no Namespace device exists, " \
-        L"NamespaceString[] must contain a period '.'",
+      L"NamespaceString[] must contain a period '.'",
       NameSpaceStrLen
       );
@@ -57 +57 @@
 
 /// An ACPI_PARSER array describing the ACPI DBG2 table.
-STATIC CONST ACPI_PARSER Dbg2Parser[] = {
+STATIC CONST ACPI_PARSER  Dbg2Parser[] = {
   PARSE_ACPI_HEADER (&AcpiHdrInfo),
-  {L"OffsetDbgDeviceInfo", 4, 36, L"0x%x", NULL,
-   (VOID**)&OffsetDbgDeviceInfo, NULL, NULL},
-  {L"NumberDbgDeviceInfo", 4, 40, L"%d", NULL,
-   (VOID**)&NumberDbgDeviceInfo, NULL, NULL}
+  { L"OffsetDbgDeviceInfo",        4,     36, L"0x%x", NULL,
+    (VOID **)&OffsetDbgDeviceInfo, NULL,  NULL },
+  { L"NumberDbgDeviceInfo",        4,     40, L"%d",   NULL,
+    (VOID **)&NumberDbgDeviceInfo, NULL,  NULL }
 };
 
 /// An ACPI_PARSER array describing the debug device information structure
 /// header.
-STATIC CONST ACPI_PARSER DbgDevInfoHeaderParser[] = {
-  {L"Revision", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 2, 1, L"%d", NULL, (VOID**)&DbgDevInfoLen, NULL, NULL}
+STATIC CONST ACPI_PARSER  DbgDevInfoHeaderParser[] = {
+  { L"Revision", 1, 0, L"0x%x", NULL, NULL,                    NULL, NULL },
+  { L"Length",   2, 1, L"%d",   NULL, (VOID **)&DbgDevInfoLen, NULL, NULL }
 };
 
 /// An ACPI_PARSER array describing the debug device information.
-STATIC CONST ACPI_PARSER DbgDevInfoParser[] = {
-  {L"Revision", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 2, 1, L"%d", NULL, NULL, NULL, NULL},
-
-  {L"Generic Address Registers Count", 1, 3, L"0x%x", NULL,
-   (VOID**)&GasCount, NULL, NULL},
-  {L"NameSpace String Length", 2, 4, L"%d", NULL,
-   (VOID**)&NameSpaceStringLength, ValidateNameSpaceStrLen, NULL},
-  {L"NameSpace String Offset", 2, 6, L"0x%x", NULL,
-   (VOID**)&NameSpaceStringOffset, NULL, NULL},
-  {L"OEM Data Length", 2, 8, L"%d", NULL, (VOID**)&OEMDataLength,
-   NULL, NULL},
-  {L"OEM Data Offset", 2, 10, L"0x%x", NULL, (VOID**)&OEMDataOffset,
-   NULL, NULL},
-
-  {L"Port Type", 2, 12, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Port SubType", 2, 14, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 2, 16, L"%x", NULL, NULL, NULL, NULL},
-
-  {L"Base Address Register Offset", 2, 18, L"0x%x", NULL,
-   (VOID**)&BaseAddrRegOffset, NULL, NULL},
-  {L"Address Size Offset", 2, 20, L"0x%x", NULL,
-   (VOID**)&AddrSizeOffset, NULL, NULL}
+STATIC CONST ACPI_PARSER  DbgDevInfoParser[] = {
+  { L"Revision",                        1, 0,  L"0x%x", NULL, NULL,                    NULL, NULL },
+  { L"Length",                          2, 1,  L"%d",   NULL, NULL,                    NULL, NULL },
+
+  { L"Generic Address Registers Count", 1, 3,  L"0x%x", NULL,
+    (VOID **)&GasCount, NULL, NULL },
+  { L"NameSpace String Length",         2, 4,  L"%d",   NULL,
+    (VOID **)&NameSpaceStringLength, ValidateNameSpaceStrLen, NULL },
+  { L"NameSpace String Offset",         2, 6,  L"0x%x", NULL,
+    (VOID **)&NameSpaceStringOffset, NULL, NULL },
+  { L"OEM Data Length",                 2, 8,  L"%d",   NULL, (VOID **)&OEMDataLength,
+    NULL, NULL },
+  { L"OEM Data Offset",                 2, 10, L"0x%x", NULL, (VOID **)&OEMDataOffset,
+    NULL, NULL },
+
+  { L"Port Type",                       2, 12, L"0x%x", NULL, NULL,                    NULL, NULL },
+  { L"Port SubType",                    2, 14, L"0x%x", NULL, NULL,                    NULL, NULL },
+  { L"Reserved",                        2, 16, L"%x",   NULL, NULL,                    NULL, NULL },
+
+  { L"Base Address Register Offset",    2, 18, L"0x%x", NULL,
+    (VOID **)&BaseAddrRegOffset, NULL, NULL },
+  { L"Address Size Offset",             2, 20, L"0x%x", NULL,
+    (VOID **)&AddrSizeOffset, NULL, NULL }
 };
 
@@ -108 +108 @@
 EFIAPI
 DumpDbgDeviceInfo (
-  IN UINT8* Ptr,
-  IN UINT16 Length
+  IN UINT8   *Ptr,
+  IN UINT16  Length
   )
 {
@@ -132 +132 @@
       (OEMDataOffset == NULL)         ||
       (BaseAddrRegOffset == NULL)     ||
-      (AddrSizeOffset == NULL)) {
+      (AddrSizeOffset == NULL))
+  {
     IncrementErrorCount ();
     Print (
       L"ERROR: Insufficient Debug Device Information Structure length. " \
-        L"Length = %d.\n",
+      L"Length = %d.\n",
       Length
       );
@@ -143 +144 @@
 
   // GAS
-  Index = 0;
+  Index  = 0;
   Offset = *BaseAddrRegOffset;
   while ((Index++ < *GasCount) &&
-         (Offset < Length)) {
+         (Offset < Length))
+  {
     PrintFieldName (4, L"BaseAddressRegister");
     Offset += (UINT16)DumpGasStruct (
@@ -161 +163 @@
     Print (
       L"ERROR: Invalid GAS count. GasCount = %d. RemainingBufferLength = %d. " \
-        L"Parsing of the Debug Device Information structure aborted.\n",
+      L"Parsing of the Debug Device Information structure aborted.\n",
       *GasCount,
       Length - *AddrSizeOffset
@@ -169 +171 @@
 
   // Address Size
-  Index = 0;
+  Index  = 0;
   Offset = *AddrSizeOffset;
   while ((Index++ < *GasCount) &&
-         (Offset < Length)) {
+         (Offset < Length))
+  {
     PrintFieldName (4, L"Address Size");
-    Print (L"0x%x\n", *((UINT32*)(Ptr + Offset)));
+    Print (L"0x%x\n", *((UINT32 *)(Ptr + Offset)));
     Offset += sizeof (UINT32);
   }
 
   // NameSpace String
-  Index = 0;
+  Index  = 0;
   Offset = *NameSpaceStringOffset;
   PrintFieldName (4, L"NameSpace String");
   while ((Index++ < *NameSpaceStringLength) &&
-         (Offset < Length)) {
+         (Offset < Length))
+  {
     Print (L"%c", *(Ptr + Offset));
     Offset++;
   }
+
   Print (L"\n");
 
   // OEM Data
   if (*OEMDataOffset != 0) {
-    Index = 0;
+    Index  = 0;
     Offset = *OEMDataOffset;
     PrintFieldName (4, L"OEM Data");
     while ((Index++ < *OEMDataLength) &&
-           (Offset < Length)) {
+           (Offset < Length))
+    {
       Print (L"%x ", *(Ptr + Offset));
       if ((Index & 7) == 0) {
         Print (L"\n%-*s   ", OUTPUT_FIELD_COLUMN_WIDTH, L"");
       }
+
       Offset++;
     }
+
     Print (L"\n");
   }
@@ -221 +229 @@
 EFIAPI
 ParseAcpiDbg2 (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
   )
 {
-  UINT32 Offset;
-  UINT32 Index;
+  UINT32  Offset;
+  UINT32  Index;
 
   if (!Trace) {
@@ -246 +254 @@
   // successfully read.
   if ((OffsetDbgDeviceInfo == NULL) ||
-      (NumberDbgDeviceInfo == NULL)) {
+      (NumberDbgDeviceInfo == NULL))
+  {
     IncrementErrorCount ();
     Print (
@@ -256 +265 @@
 
   Offset = *OffsetDbgDeviceInfo;
-  Index = 0;
+  Index  = 0;
 
   while (Index++ < *NumberDbgDeviceInfo) {
-
     // Parse the Debug Device Information Structure header to obtain Length
     ParseAcpi (
@@ -276 +284 @@
       Print (
         L"ERROR: Insufficient remaining table buffer length to read the " \
-          L"Debug Device Information structure's 'Length' field. " \
-          L"RemainingTableBufferLength = %d.\n",
+        L"Debug Device Information structure's 'Length' field. " \
+        L"RemainingTableBufferLength = %d.\n",
         AcpiTableLength - Offset
         );
@@ -285 +293 @@
     // Validate Debug Device Information Structure length
     if ((*DbgDevInfoLen == 0) ||
-        ((Offset + (*DbgDevInfoLen)) > AcpiTableLength)) {
+        ((Offset + (*DbgDevInfoLen)) > AcpiTableLength))
+    {
       IncrementErrorCount ();
       Print (
         L"ERROR: Invalid Debug Device Information Structure length. " \
-          L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
+        L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
         *DbgDevInfoLen,
         Offset,

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dsdt/DsdtParser.c

@@ -2 +2 @@
   DSDT table parser
 
-  Copyright (c) 2016 - 2018, ARM Limited. All rights reserved.
+  Copyright (c) 2016 - 2022, ARM Limited. All rights reserved.
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -29 +29 @@
 EFIAPI
 ParseAcpiDsdt (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
   )
 {
@@ -40 +40 @@
 
   DumpAcpiHeader (Ptr);
+
+  // As per 19.6.29 in the version 6.4 of the ACPI spec, a revision less than 2
+  // restricts integers to 32 bit width. This may not be intended, raise a
+  // warning
+ #if defined (MDE_CPU_AARCH64) || defined (MDE_CPU_ARM)
+  if (AcpiTableRevision < 2) {
+    IncrementWarningCount ();
+    Print (
+      L"WARNING: DSDT Table Revision less than 2. Integer width restricted to "
+      L"32 bits. Table Revision = %d.\n",
+      AcpiTableRevision
+      );
+    return;
+  }
+
+ #endif
 }

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Facs/FacsParser.c

@@ -17 +17 @@
   An ACPI_PARSER array describing the ACPI FACS Table.
 **/
-STATIC CONST ACPI_PARSER FacsParser[] = {
-  {L"Signature", 4, 0, L"%c%c%c%c", Dump4Chars, NULL, NULL, NULL},
-  {L"Length", 4, 4, L"%d", NULL,  NULL, NULL, NULL},
-  {L"Hardware Signature", 4, 8, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Firmware Waking Vector", 4, 12, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Global Lock", 4, 16, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Flags", 4, 20, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"X Firmware Walking Vector", 8, 24, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Version", 1, 32, L"%d", NULL, NULL, NULL, NULL},
-  {L"Reserved", 3, 33, L"%x %x %x", Dump3Chars, NULL, NULL, NULL},
-  {L"OSPM Flags", 4, 36, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 8, 40, L"%x %x %x %x %x %x %x %x", Dump8Chars, NULL, NULL,
-    NULL},
-  {L"Reserved", 8, 48, L"%x %x %x %x %x %x %x %x", Dump8Chars, NULL, NULL,
-    NULL},
-  {L"Reserved", 8, 56, L"%x %x %x %x %x %x %x %x", Dump8Chars, NULL, NULL,
-    NULL}
+STATIC CONST ACPI_PARSER  FacsParser[] = {
+  { L"Signature",                 4, 0,  L"%c%c%c%c",                Dump4Chars, NULL, NULL, NULL },
+  { L"Length",                    4, 4,  L"%d",                      NULL,       NULL, NULL, NULL },
+  { L"Hardware Signature",        4, 8,  L"0x%x",                    NULL,       NULL, NULL, NULL },
+  { L"Firmware Waking Vector",    4, 12, L"0x%x",                    NULL,       NULL, NULL, NULL },
+  { L"Global Lock",               4, 16, L"0x%x",                    NULL,       NULL, NULL, NULL },
+  { L"Flags",                     4, 20, L"0x%x",                    NULL,       NULL, NULL, NULL },
+  { L"X Firmware Walking Vector", 8, 24, L"0x%lx",                   NULL,       NULL, NULL, NULL },
+  { L"Version",                   1, 32, L"%d",                      NULL,       NULL, NULL, NULL },
+  { L"Reserved",                  3, 33, L"%x %x %x",                Dump3Chars, NULL, NULL, NULL },
+  { L"OSPM Flags",                4, 36, L"0x%x",                    NULL,       NULL, NULL, NULL },
+  { L"Reserved",                  8, 40, L"%x %x %x %x %x %x %x %x", Dump8Chars, NULL, NULL,
+    NULL },
+  { L"Reserved",                  8, 48, L"%x %x %x %x %x %x %x %x", Dump8Chars, NULL, NULL,
+    NULL },
+  { L"Reserved",                  8, 56, L"%x %x %x %x %x %x %x %x", Dump8Chars, NULL, NULL,
+    NULL }
 };
 
@@ -51 +51 @@
 EFIAPI
 ParseAcpiFacs (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
   )
 {

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c

@@ -3 +3 @@
 
   Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.
+  Copyright (c) 2022, AMD Incorporated. All rights reserved.
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -16 +17 @@
 
 // Local variables
-STATIC CONST UINT32* DsdtAddress;
-STATIC CONST UINT64* X_DsdtAddress;
-STATIC CONST UINT32* Flags;
-STATIC CONST UINT32* FirmwareCtrl;
-STATIC CONST UINT64* X_FirmwareCtrl;
-STATIC CONST UINT8*  FadtMinorRevision;
-STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
+STATIC CONST UINT32                  *DsdtAddress;
+STATIC CONST UINT64                  *X_DsdtAddress;
+STATIC CONST UINT32                  *Flags;
+STATIC CONST UINT32                  *FirmwareCtrl;
+STATIC CONST UINT64                  *X_FirmwareCtrl;
+STATIC CONST UINT8                   *FadtMinorRevision;
+STATIC ACPI_DESCRIPTION_HEADER_INFO  AcpiHdrInfo;
 
 /**
   A macro defining the Hardware reduced ACPI flag
 **/
-#define HW_REDUCED_ACPI   BIT20
+#define HW_REDUCED_ACPI  BIT20
 
 /**
   Offset to the FACS signature from the start of the FACS.
 **/
-#define FACS_SIGNATURE_OFFSET   0
+#define FACS_SIGNATURE_OFFSET  0
 
 /**
   Offset to the FACS revision from the start of the FACS.
 **/
-#define FACS_VERSION_OFFSET     32
+#define FACS_VERSION_OFFSET  32
 
 /**
   Offset to the FACS length from the start of the FACS.
 **/
-#define FACS_LENGTH_OFFSET      4
+#define FACS_LENGTH_OFFSET  4
 
 /**
@@ -64 +65 @@
 EFIAPI
 ValidateFirmwareCtrl (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-)
-{
-#if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
-  if (*(UINT32*)Ptr != 0) {
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+ #if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
+  if (*(UINT32 *)Ptr != 0) {
     IncrementErrorCount ();
     Print (
       L"\nERROR: Firmware Control must be zero for ARM platforms."
-    );
-  }
-#endif
+      );
+  }
+
+ #endif
 }
 
@@ -89 +91 @@
 EFIAPI
 ValidateXFirmwareCtrl (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-)
-{
-#if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
-  if (*(UINT64*)Ptr != 0) {
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+ #if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
+  if (*(UINT64 *)Ptr != 0) {
     IncrementErrorCount ();
     Print (
       L"\nERROR: X Firmware Control must be zero for ARM platforms."
-    );
-  }
-#endif
+      );
+  }
+
+ #endif
 }
 
@@ -114 +117 @@
 EFIAPI
 ValidateFlags (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-)
-{
-#if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
-  if (((*(UINT32*)Ptr) & HW_REDUCED_ACPI) == 0) {
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+ #if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
+  if (((*(UINT32 *)Ptr) & HW_REDUCED_ACPI) == 0) {
     IncrementErrorCount ();
     Print (
       L"\nERROR: HW_REDUCED_ACPI flag must be set for ARM platforms."
+      );
+  }
+
+ #endif
+}
+
+STATIC CONST ACPI_PARSER  FadtFlagParser[] = {
+  { L"WBINVD",                               1,  0,  L"%d", NULL, NULL, NULL, NULL },
+  { L"WBINVD_FLUSH",                         1,  1,  L"%d", NULL, NULL, NULL, NULL },
+  { L"PROC_C1",                              1,  2,  L"%d", NULL, NULL, NULL, NULL },
+  { L"P_LVL2_UP",                            1,  3,  L"%d", NULL, NULL, NULL, NULL },
+  { L"PWR_BUTTON",                           1,  4,  L"%d", NULL, NULL, NULL, NULL },
+  { L"SLP_BUTTON",                           1,  5,  L"%d", NULL, NULL, NULL, NULL },
+  { L"FIX_RTC",                              1,  6,  L"%d", NULL, NULL, NULL, NULL },
+  { L"RTC_S4",                               1,  7,  L"%d", NULL, NULL, NULL, NULL },
+  { L"TMR_VAL_EXT",                          1,  8,  L"%d", NULL, NULL, NULL, NULL },
+  { L"DCK_CAP",                              1,  9,  L"%d", NULL, NULL, NULL, NULL },
+  { L"RESET_REG_SUP",                        1,  10, L"%d", NULL, NULL, NULL, NULL },
+  { L"SEALED_CASE",                          1,  11, L"%d", NULL, NULL, NULL, NULL },
+  { L"HEADLESS",                             1,  12, L"%d", NULL, NULL, NULL, NULL },
+  { L"CPU_SW_SLP",                           1,  13, L"%d", NULL, NULL, NULL, NULL },
+  { L"PCI_EXP_WAK",                          1,  14, L"%d", NULL, NULL, NULL, NULL },
+  { L"USE_PLATFORM_CLOCK",                   1,  15, L"%d", NULL, NULL, NULL, NULL },
+  { L"S4_RTC_STS_VALID",                     1,  16, L"%d", NULL, NULL, NULL, NULL },
+  { L"REMOTE_POWER_ON_CAPABLE",              1,  17, L"%d", NULL, NULL, NULL, NULL },
+  { L"FORCE_APIC_CLUSTER_MODEL",             1,  18, L"%d", NULL, NULL, NULL, NULL },
+  { L"FORCE_APIC_PHYSICAL_DESTINATION_MODE", 1,  19, L"%d", NULL, NULL, NULL, NULL },
+  { L"HW_REDUCED_ACPI",                      1,  20, L"%d", NULL, NULL, NULL, NULL },
+  { L"LOW_POWER_S0_IDLE_CAPABLE",            1,  21, L"%d", NULL, NULL, NULL, NULL },
+  { L"Reserved",                             10, 22, L"%d", NULL, NULL, NULL, NULL }
+};
+
+/**
+  This function traces FADT Flags fields.
+  If no format string is specified the Format must be NULL.
+
+  @param [in] Format  Optional format string for tracing the data.
+  @param [in] Ptr     Pointer to the start of the buffer.
+**/
+VOID
+EFIAPI
+DumpFadtFlags (
+  IN CONST CHAR16  *Format OPTIONAL,
+  IN UINT8         *Ptr
+  )
+{
+  if (Format != NULL) {
+    Print (Format, *(UINT32 *)Ptr);
+    return;
+  }
+
+  Print (L"0x%X\n", *(UINT32 *)Ptr);
+  ParseAcpiBitFields (
+    TRUE,
+    2,
+    NULL,
+    Ptr,
+    4,
+    PARSER_PARAMS (FadtFlagParser)
     );
-  }
-#endif
 }
 
@@ -131 +191 @@
   An ACPI_PARSER array describing the ACPI FADT Table.
 **/
-STATIC CONST ACPI_PARSER FadtParser[] = {
+STATIC CONST ACPI_PARSER  FadtParser[] = {
   PARSE_ACPI_HEADER (&AcpiHdrInfo),
-  {L"FIRMWARE_CTRL", 4, 36, L"0x%x", NULL, (VOID**)&FirmwareCtrl,
-    ValidateFirmwareCtrl, NULL},
-  {L"DSDT", 4, 40, L"0x%x", NULL, (VOID**)&DsdtAddress, NULL, NULL},
-  {L"Reserved", 1, 44, L"%x", NULL, NULL, NULL, NULL},
-  {L"Preferred_PM_Profile", 1, 45, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"SCI_INT", 2, 46, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"SMI_CMD", 4, 48, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"ACPI_ENABLE", 1, 52, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"ACPI_DISABLE", 1, 53, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"S4BIOS_REQ", 1, 54, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PSTATE_CNT", 1, 55, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PM1a_EVT_BLK", 4, 56, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PM1b_EVT_BLK", 4, 60, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PM1a_CNT_BLK", 4, 64, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PM1b_CNT_BLK", 4, 68, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PM2_CNT_BLK", 4, 72, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PM_TMR_BLK", 4, 76, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"GPE0_BLK", 4, 80, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"GPE1_BLK", 4, 84, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PM1_EVT_LEN", 1, 88, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PM1_CNT_LEN", 1, 89, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PM2_CNT_LEN", 1, 90, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PM_TMR_LEN", 1, 91, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"GPE0_BLK_LEN", 1, 92, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"GPE1_BLK_LEN", 1, 93, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"GPE1_BASE", 1, 94, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"CST_CNT", 1, 95, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"P_LVL2_LAT", 2, 96, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"P_LVL3_LAT", 2, 98, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"FLUSH_SIZE", 2, 100, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"FLUSH_STRIDE", 2, 102, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"DUTY_OFFSET", 1, 104, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"DUTY_WIDTH", 1, 105, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"DAY_ALRM", 1, 106, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"MON_ALRM", 1, 107, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"CENTURY", 1, 108, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"IAPC_BOOT_ARCH", 2, 109, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 1, 111, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Flags", 4, 112, L"0x%x", NULL, (VOID**)&Flags, ValidateFlags, NULL},
-  {L"RESET_REG", 12, 116, NULL, DumpGas, NULL, NULL, NULL},
-  {L"RESET_VALUE", 1, 128, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"ARM_BOOT_ARCH", 2, 129, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"FADT Minor Version", 1, 131, L"0x%x", NULL, (VOID**)&FadtMinorRevision,
-    NULL, NULL},
-  {L"X_FIRMWARE_CTRL", 8, 132, L"0x%lx", NULL, (VOID**)&X_FirmwareCtrl,
-    ValidateXFirmwareCtrl, NULL},
-  {L"X_DSDT", 8, 140, L"0x%lx", NULL, (VOID**)&X_DsdtAddress, NULL, NULL},
-  {L"X_PM1a_EVT_BLK", 12, 148, NULL, DumpGas, NULL, NULL, NULL},
-  {L"X_PM1b_EVT_BLK", 12, 160, NULL, DumpGas, NULL, NULL, NULL},
-  {L"X_PM1a_CNT_BLK", 12, 172, NULL, DumpGas, NULL, NULL, NULL},
-  {L"X_PM1b_CNT_BLK", 12, 184, NULL, DumpGas, NULL, NULL, NULL},
-  {L"X_PM2_CNT_BLK", 12, 196, NULL, DumpGas, NULL, NULL, NULL},
-  {L"X_PM_TMR_BLK", 12, 208, NULL, DumpGas, NULL, NULL, NULL},
-  {L"X_GPE0_BLK", 12, 220, NULL, DumpGas, NULL, NULL, NULL},
-  {L"X_GPE1_BLK", 12, 232, NULL, DumpGas, NULL, NULL, NULL},
-  {L"SLEEP_CONTROL_REG", 12, 244, NULL, DumpGas, NULL, NULL, NULL},
-  {L"SLEEP_STATUS_REG", 12, 256, NULL, DumpGas, NULL, NULL, NULL},
-  {L"Hypervisor VendorIdentity", 8, 268, L"%lx", NULL, NULL, NULL, NULL}
+  { L"FIRMWARE_CTRL",              4,   36,  L"0x%x",  NULL,          (VOID **)&FirmwareCtrl,
+    ValidateFirmwareCtrl,          NULL },
+  { L"DSDT",                       4,   40,  L"0x%x",  NULL,          (VOID **)&DsdtAddress,      NULL,           NULL },
+  { L"Reserved",                   1,   44,  L"%x",    NULL,          NULL,                       NULL,           NULL },
+  { L"Preferred_PM_Profile",       1,   45,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"SCI_INT",                    2,   46,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"SMI_CMD",                    4,   48,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"ACPI_ENABLE",                1,   52,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"ACPI_DISABLE",               1,   53,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"S4BIOS_REQ",                 1,   54,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"PSTATE_CNT",                 1,   55,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"PM1a_EVT_BLK",               4,   56,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"PM1b_EVT_BLK",               4,   60,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"PM1a_CNT_BLK",               4,   64,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"PM1b_CNT_BLK",               4,   68,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"PM2_CNT_BLK",                4,   72,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"PM_TMR_BLK",                 4,   76,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"GPE0_BLK",                   4,   80,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"GPE1_BLK",                   4,   84,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"PM1_EVT_LEN",                1,   88,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"PM1_CNT_LEN",                1,   89,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"PM2_CNT_LEN",                1,   90,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"PM_TMR_LEN",                 1,   91,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"GPE0_BLK_LEN",               1,   92,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"GPE1_BLK_LEN",               1,   93,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"GPE1_BASE",                  1,   94,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"CST_CNT",                    1,   95,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"P_LVL2_LAT",                 2,   96,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"P_LVL3_LAT",                 2,   98,  L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"FLUSH_SIZE",                 2,   100, L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"FLUSH_STRIDE",               2,   102, L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"DUTY_OFFSET",                1,   104, L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"DUTY_WIDTH",                 1,   105, L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"DAY_ALRM",                   1,   106, L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"MON_ALRM",                   1,   107, L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"CENTURY",                    1,   108, L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"IAPC_BOOT_ARCH",             2,   109, L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"Reserved",                   1,   111, L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"Flags",                      4,   112, NULL,     DumpFadtFlags, (VOID **)&Flags,            ValidateFlags,  NULL },
+  { L"RESET_REG",                  12,  116, NULL,     DumpGas,       NULL,                       NULL,           NULL },
+  { L"RESET_VALUE",                1,   128, L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"ARM_BOOT_ARCH",              2,   129, L"0x%x",  NULL,          NULL,                       NULL,           NULL },
+  { L"FADT Minor Version",         1,   131, L"0x%x",  NULL,          (VOID **)&FadtMinorRevision,
+    NULL,                          NULL },
+  { L"X_FIRMWARE_CTRL",            8,   132, L"0x%lx", NULL,          (VOID **)&X_FirmwareCtrl,
+    ValidateXFirmwareCtrl,         NULL },
+  { L"X_DSDT",                     8,   140, L"0x%lx", NULL,          (VOID **)&X_DsdtAddress,    NULL,           NULL },
+  { L"X_PM1a_EVT_BLK",             12,  148, NULL,     DumpGas,       NULL,                       NULL,           NULL },
+  { L"X_PM1b_EVT_BLK",             12,  160, NULL,     DumpGas,       NULL,                       NULL,           NULL },
+  { L"X_PM1a_CNT_BLK",             12,  172, NULL,     DumpGas,       NULL,                       NULL,           NULL },
+  { L"X_PM1b_CNT_BLK",             12,  184, NULL,     DumpGas,       NULL,                       NULL,           NULL },
+  { L"X_PM2_CNT_BLK",              12,  196, NULL,     DumpGas,       NULL,                       NULL,           NULL },
+  { L"X_PM_TMR_BLK",               12,  208, NULL,     DumpGas,       NULL,                       NULL,           NULL },
+  { L"X_GPE0_BLK",                 12,  220, NULL,     DumpGas,       NULL,                       NULL,           NULL },
+  { L"X_GPE1_BLK",                 12,  232, NULL,     DumpGas,       NULL,                       NULL,           NULL },
+  { L"SLEEP_CONTROL_REG",          12,  244, NULL,     DumpGas,       NULL,                       NULL,           NULL },
+  { L"SLEEP_STATUS_REG",           12,  256, NULL,     DumpGas,       NULL,                       NULL,           NULL },
+  { L"Hypervisor VendorIdentity",  8,   268, L"%lx",   NULL,          NULL,                       NULL,           NULL }
 };
 
@@ -207 +267 @@
 EFIAPI
 ParseAcpiFadt (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
-  )
-{
-  EFI_STATUS              Status;
-  UINT8*                  DsdtPtr;
-  UINT8*                  FirmwareCtrlPtr;
-  UINT32                  FacsSignature;
-  UINT32                  FacsLength;
-  UINT8                   FacsRevision;
-  PARSE_ACPI_TABLE_PROC   FacsParserProc;
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
+  )
+{
+  EFI_STATUS             Status;
+  UINT8                  *DsdtPtr;
+  UINT8                  *FirmwareCtrlPtr;
+  UINT32                 FacsSignature;
+  UINT32                 FacsLength;
+  UINT8                  FacsRevision;
+  PARSE_ACPI_TABLE_PROC  FacsParserProc;
 
   ParseAcpi (
@@ -234 +294 @@
       Print (L"\nSummary:\n");
       PrintFieldName (2, L"FADT Version");
-      Print (L"%d.%d\n",  *AcpiHdrInfo.Revision, *FadtMinorRevision);
+      Print (L"%d.%d\n", *AcpiHdrInfo.Revision, *FadtMinorRevision);
     }
 
@@ -246 +306 @@
   // FIRMWARE_CTRL, else use FIRMWARE_CTRL.
   if ((X_FirmwareCtrl != NULL) && (*X_FirmwareCtrl != 0)) {
-    FirmwareCtrlPtr = (UINT8*)(UINTN)(*X_FirmwareCtrl);
+    FirmwareCtrlPtr = (UINT8 *)(UINTN)(*X_FirmwareCtrl);
   } else if ((FirmwareCtrl != NULL) && (*FirmwareCtrl != 0)) {
-    FirmwareCtrlPtr = (UINT8*)(UINTN)(*FirmwareCtrl);
+    FirmwareCtrlPtr = (UINT8 *)(UINTN)(*FirmwareCtrl);
   } else {
     FirmwareCtrlPtr = NULL;
@@ -256 +316 @@
     if ((Trace) &&
         (Flags != NULL) &&
-        ((*Flags & EFI_ACPI_6_3_HW_REDUCED_ACPI) != EFI_ACPI_6_3_HW_REDUCED_ACPI)) {
+        ((*Flags & EFI_ACPI_6_3_HW_REDUCED_ACPI) != EFI_ACPI_6_3_HW_REDUCED_ACPI))
+    {
       IncrementErrorCount ();
-      Print (L"ERROR: No FACS table found, "
-               L"both X_FIRMWARE_CTRL and FIRMWARE_CTRL are zero.\n");
+      Print (
+        L"ERROR: No FACS table found, "
+        L"both X_FIRMWARE_CTRL and FIRMWARE_CTRL are zero.\n"
+        );
     }
   }
@@ -267 +330 @@
     // the signature, length and version needs to be initially parsed.
     // The FACS signature is 4 bytes starting at offset 0.
-    FacsSignature = *(UINT32*)(FirmwareCtrlPtr + FACS_SIGNATURE_OFFSET);
+    FacsSignature = *(UINT32 *)(FirmwareCtrlPtr + FACS_SIGNATURE_OFFSET);
 
     // The FACS length is 4 bytes starting at offset 4.
-    FacsLength = *(UINT32*)(FirmwareCtrlPtr + FACS_LENGTH_OFFSET);
+    FacsLength = *(UINT32 *)(FirmwareCtrlPtr + FACS_LENGTH_OFFSET);
 
     // The FACS version is 1 byte starting at offset 32.
-    FacsRevision = *(UINT8*)(FirmwareCtrlPtr + FACS_VERSION_OFFSET);
+    FacsRevision = *(UINT8 *)(FirmwareCtrlPtr + FACS_VERSION_OFFSET);
 
     Trace = ProcessTableReportOptions (
@@ -299 +362 @@
   // If X_DSDT is valid then use X_DSDT and ignore DSDT, else use DSDT.
   if ((X_DsdtAddress != NULL) && (*X_DsdtAddress != 0)) {
-    DsdtPtr = (UINT8*)(UINTN)(*X_DsdtAddress);
+    DsdtPtr = (UINT8 *)(UINTN)(*X_DsdtAddress);
   } else if ((DsdtAddress != NULL) && (*DsdtAddress != 0)) {
-    DsdtPtr = (UINT8*)(UINTN)(*DsdtAddress);
+    DsdtPtr = (UINT8 *)(UINTN)(*DsdtAddress);
   } else {
     // Both DSDT and X_DSDT cannot be invalid.
-#if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
+ #if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
     if (Trace) {
       // The DSDT Table is mandatory for ARM systems
@@ -312 +375 @@
       Print (L"ERROR: Both X_DSDT and DSDT are invalid.\n");
     }
-#endif
+
+ #endif
     return;
   }

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c

@@ -2 +2 @@
   GTDT table parser
 
-  Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.
+  Copyright (c) 2016 - 2021, ARM Limited. All rights reserved.
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @par Reference(s):
-    - ACPI 6.3 Specification - January 2019
+    - ACPI 6.4 Specification - January 2021
   **/
 
@@ -16 +16 @@
 
 // "The number of GT Block Timers must be less than or equal to 8"
-#define GT_BLOCK_TIMER_COUNT_MAX 8
+#define GT_BLOCK_TIMER_COUNT_MAX  8
 
 // Local variables
-STATIC CONST UINT32* GtdtPlatformTimerCount;
-STATIC CONST UINT32* GtdtPlatformTimerOffset;
-STATIC CONST UINT8*  PlatformTimerType;
-STATIC CONST UINT16* PlatformTimerLength;
-STATIC CONST UINT32* GtBlockTimerCount;
-STATIC CONST UINT32* GtBlockTimerOffset;
-STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
+STATIC CONST UINT32                  *GtdtPlatformTimerCount;
+STATIC CONST UINT32                  *GtdtPlatformTimerOffset;
+STATIC CONST UINT8                   *PlatformTimerType;
+STATIC CONST UINT16                  *PlatformTimerLength;
+STATIC CONST UINT32                  *GtBlockTimerCount;
+STATIC CONST UINT32                  *GtBlockTimerOffset;
+STATIC ACPI_DESCRIPTION_HEADER_INFO  AcpiHdrInfo;
 
 /**
@@ -38 +38 @@
 EFIAPI
 ValidateGtBlockTimerCount (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-  )
-{
-  UINT32 BlockTimerCount;
-
-  BlockTimerCount = *(UINT32*)Ptr;
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  UINT32  BlockTimerCount;
+
+  BlockTimerCount = *(UINT32 *)Ptr;
 
   if (BlockTimerCount > GT_BLOCK_TIMER_COUNT_MAX) {
@@ -67 +67 @@
 EFIAPI
 ValidateGtFrameNumber (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-  )
-{
-  UINT8 FrameNumber;
-
-  FrameNumber = *(UINT8*)Ptr;
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  UINT8  FrameNumber;
+
+  FrameNumber = *(UINT8 *)Ptr;
 
   if (FrameNumber >= GT_BLOCK_TIMER_COUNT_MAX) {
@@ -88 +88 @@
   An ACPI_PARSER array describing the ACPI GTDT Table.
 **/
-STATIC CONST ACPI_PARSER GtdtParser[] = {
+STATIC CONST ACPI_PARSER  GtdtParser[] = {
   PARSE_ACPI_HEADER (&AcpiHdrInfo),
-  {L"CntControlBase Physical Address", 8, 36, L"0x%lx", NULL, NULL,
-   NULL, NULL},
-  {L"Reserved", 4, 44, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Secure EL1 timer GSIV", 4, 48, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Secure EL1 timer FLAGS", 4, 52, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"Non-Secure EL1 timer GSIV", 4, 56, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Non-Secure EL1 timer FLAGS", 4, 60, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"Virtual timer GSIV", 4, 64, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Virtual timer FLAGS", 4, 68, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"Non-Secure EL2 timer GSIV", 4, 72, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Non-Secure EL2 timer FLAGS", 4, 76, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"CntReadBase Physical address", 8, 80, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Platform Timer Count", 4, 88, L"%d", NULL,
-   (VOID**)&GtdtPlatformTimerCount, NULL, NULL},
-  {L"Platform Timer Offset", 4, 92, L"0x%x", NULL,
-   (VOID**)&GtdtPlatformTimerOffset, NULL, NULL},
-  {L"Virtual EL2 Timer GSIV", 4, 96, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Virtual EL2 Timer Flags", 4, 100, L"0x%x", NULL, NULL, NULL, NULL}
+  { L"CntControlBase Physical Address",8,      36,  L"0x%lx", NULL, NULL,
+    NULL,                             NULL },
+  { L"Reserved",                      4,      44,  L"0x%x",  NULL, NULL,NULL,  NULL },
+  { L"Secure EL1 timer GSIV",         4,      48,  L"0x%x",  NULL, NULL,NULL,  NULL },
+  { L"Secure EL1 timer FLAGS",        4,      52,  L"0x%x",  NULL, NULL,NULL,  NULL },
+
+  { L"Non-Secure EL1 timer GSIV",     4,      56,  L"0x%x",  NULL, NULL,NULL,  NULL },
+  { L"Non-Secure EL1 timer FLAGS",    4,      60,  L"0x%x",  NULL, NULL,NULL,  NULL },
+
+  { L"Virtual timer GSIV",            4,      64,  L"0x%x",  NULL, NULL,NULL,  NULL },
+  { L"Virtual timer FLAGS",           4,      68,  L"0x%x",  NULL, NULL,NULL,  NULL },
+
+  { L"Non-Secure EL2 timer GSIV",     4,      72,  L"0x%x",  NULL, NULL,NULL,  NULL },
+  { L"Non-Secure EL2 timer FLAGS",    4,      76,  L"0x%x",  NULL, NULL,NULL,  NULL },
+
+  { L"CntReadBase Physical address",  8,      80,  L"0x%lx", NULL, NULL,NULL,  NULL },
+  { L"Platform Timer Count",          4,      88,  L"%d",    NULL,
+    (VOID **)&GtdtPlatformTimerCount, NULL,   NULL },
+  { L"Platform Timer Offset",         4,      92,  L"0x%x",  NULL,
+    (VOID **)&GtdtPlatformTimerOffset,NULL,   NULL },
+  { L"Virtual EL2 Timer GSIV",        4,      96,  L"0x%x",  NULL, NULL,NULL,  NULL },
+  { L"Virtual EL2 Timer Flags",       4,      100, L"0x%x",  NULL, NULL,NULL,  NULL }
 };
 
@@ -117 +117 @@
   An ACPI_PARSER array describing the Platform timer header.
 **/
-STATIC CONST ACPI_PARSER GtPlatformTimerHeaderParser[] = {
-  {L"Type", 1, 0, NULL, NULL, (VOID**)&PlatformTimerType, NULL, NULL},
-  {L"Length", 2, 1, NULL, NULL, (VOID**)&PlatformTimerLength, NULL, NULL},
-  {L"Reserved", 1, 3, NULL, NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  GtPlatformTimerHeaderParser[] = {
+  { L"Type",     1, 0, NULL, NULL, (VOID **)&PlatformTimerType,   NULL, NULL },
+  { L"Length",   2, 1, NULL, NULL, (VOID **)&PlatformTimerLength, NULL, NULL },
+  { L"Reserved", 1, 3, NULL, NULL, NULL,                          NULL, NULL }
 };
 
@@ -126 +126 @@
   An ACPI_PARSER array describing the Platform GT Block.
 **/
-STATIC CONST ACPI_PARSER GtBlockParser[] = {
-  {L"Type", 1, 0, L"%d", NULL, NULL, NULL, NULL},
-  {L"Length", 2, 1, L"%d", NULL, NULL, NULL, NULL},
-  {L"Reserved", 1, 3, L"%x", NULL, NULL, NULL, NULL},
-  {L"Physical address (CntCtlBase)", 8, 4, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Timer Count", 4, 12, L"%d", NULL, (VOID**)&GtBlockTimerCount,
-   ValidateGtBlockTimerCount, NULL},
-  {L"Timer Offset", 4, 16, L"%d", NULL, (VOID**)&GtBlockTimerOffset, NULL,
-    NULL}
+STATIC CONST ACPI_PARSER  GtBlockParser[] = {
+  { L"Type",                          1, 0,  L"%d",    NULL, NULL,                         NULL, NULL },
+  { L"Length",                        2, 1,  L"%d",    NULL, NULL,                         NULL, NULL },
+  { L"Reserved",                      1, 3,  L"%x",    NULL, NULL,                         NULL, NULL },
+  { L"Physical address (CntCtlBase)", 8, 4,  L"0x%lx", NULL, NULL,                         NULL, NULL },
+  { L"Timer Count",                   4, 12, L"%d",    NULL, (VOID **)&GtBlockTimerCount,
+    ValidateGtBlockTimerCount, NULL },
+  { L"Timer Offset",                  4, 16, L"%d",    NULL, (VOID **)&GtBlockTimerOffset, NULL,
+    NULL }
 };
 
@@ -140 +140 @@
   An ACPI_PARSER array describing the GT Block timer.
 **/
-STATIC CONST ACPI_PARSER GtBlockTimerParser[] = {
-  {L"Frame Number", 1, 0, L"%d", NULL, NULL, ValidateGtFrameNumber, NULL},
-  {L"Reserved", 3, 1, L"%x %x %x", Dump3Chars, NULL, NULL, NULL},
-  {L"Physical address (CntBaseX)", 8, 4, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Physical address (CntEL0BaseX)", 8, 12, L"0x%lx", NULL, NULL, NULL,
-    NULL},
-  {L"Physical Timer GSIV", 4, 20, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Physical Timer Flags", 4, 24, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Virtual Timer GSIV", 4, 28, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Virtual Timer Flags", 4, 32, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Common Flags", 4, 36, L"0x%x", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  GtBlockTimerParser[] = {
+  { L"Frame Number",                   1, 0,  L"%d",       NULL,       NULL, ValidateGtFrameNumber, NULL },
+  { L"Reserved",                       3, 1,  L"%x %x %x", Dump3Chars, NULL, NULL,                  NULL },
+  { L"Physical address (CntBaseX)",    8, 4,  L"0x%lx",    NULL,       NULL, NULL,                  NULL },
+  { L"Physical address (CntEL0BaseX)", 8, 12, L"0x%lx",    NULL,       NULL, NULL,
+    NULL },
+  { L"Physical Timer GSIV",            4, 20, L"0x%x",     NULL,       NULL, NULL,                  NULL },
+  { L"Physical Timer Flags",           4, 24, L"0x%x",     NULL,       NULL, NULL,                  NULL },
+  { L"Virtual Timer GSIV",             4, 28, L"0x%x",     NULL,       NULL, NULL,                  NULL },
+  { L"Virtual Timer Flags",            4, 32, L"0x%x",     NULL,       NULL, NULL,                  NULL },
+  { L"Common Flags",                   4, 36, L"0x%x",     NULL,       NULL, NULL,                  NULL }
 };
 
@@ -156 +156 @@
   An ACPI_PARSER array describing the Platform Watchdog.
 **/
-STATIC CONST ACPI_PARSER SBSAGenericWatchdogParser[] = {
-  {L"Type", 1, 0, L"%d", NULL, NULL, NULL, NULL},
-  {L"Length", 2, 1, L"%d", NULL, NULL, NULL, NULL},
-  {L"Reserved", 1, 3, L"%x", NULL, NULL, NULL, NULL},
-  {L"RefreshFrame Physical address", 8, 4, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"ControlFrame Physical address", 8, 12, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Watchdog Timer GSIV", 4, 20, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Watchdog Timer Flags", 4, 24, L"0x%x", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  ArmGenericWatchdogParser[] = {
+  { L"Type",                          1, 0,  L"%d",    NULL, NULL, NULL, NULL },
+  { L"Length",                        2, 1,  L"%d",    NULL, NULL, NULL, NULL },
+  { L"Reserved",                      1, 3,  L"%x",    NULL, NULL, NULL, NULL },
+  { L"RefreshFrame Physical address", 8, 4,  L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"ControlFrame Physical address", 8, 12, L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"Watchdog Timer GSIV",           4, 20, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Watchdog Timer Flags",          4, 24, L"0x%x",  NULL, NULL, NULL, NULL }
 };
 
@@ -175 +175 @@
 VOID
 DumpGTBlock (
-  IN UINT8* Ptr,
-  IN UINT16 Length
-  )
-{
-  UINT32 Index;
-  UINT32 Offset;
+  IN UINT8   *Ptr,
+  IN UINT16  Length
+  )
+{
+  UINT32  Index;
+  UINT32  Offset;
 
   ParseAcpi (
@@ -194 +194 @@
   // successfully read.
   if ((GtBlockTimerCount == NULL) ||
-      (GtBlockTimerOffset == NULL)) {
+      (GtBlockTimerOffset == NULL))
+  {
     IncrementErrorCount ();
     Print (
@@ -204 +205 @@
 
   Offset = *GtBlockTimerOffset;
-  Index = 0;
+  Index  = 0;
 
   // Parse the specified number of GT Block Timer Structures or the GT Block
   // Structure buffer length. Whichever is minimum.
   while ((Index++ < *GtBlockTimerCount) &&
-         (Offset < Length)) {
+         (Offset < Length))
+  {
     Offset += ParseAcpi (
                 TRUE,
@@ -230 +232 @@
 VOID
 DumpWatchdogTimer (
-  IN UINT8* Ptr,
-  IN UINT16 Length
+  IN UINT8   *Ptr,
+  IN UINT16  Length
   )
 {
@@ -237 +239 @@
     TRUE,
     2,
-    "SBSA Generic Watchdog",
+    "Arm Generic Watchdog",
     Ptr,
     Length,
-    PARSER_PARAMS (SBSAGenericWatchdogParser)
+    PARSER_PARAMS (ArmGenericWatchdogParser)
     );
 }
@@ -263 +265 @@
 EFIAPI
 ParseAcpiGtdt (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
-  )
-{
-  UINT32 Index;
-  UINT32 Offset;
-  UINT8* TimerPtr;
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
+  )
+{
+  UINT32  Index;
+  UINT32  Offset;
+  UINT8   *TimerPtr;
 
   if (!Trace) {
@@ -289 +291 @@
   // successfully read.
   if ((GtdtPlatformTimerCount == NULL) ||
-      (GtdtPlatformTimerOffset == NULL)) {
+      (GtdtPlatformTimerOffset == NULL))
+  {
     IncrementErrorCount ();
     Print (
@@ -299 +302 @@
 
   TimerPtr = Ptr + *GtdtPlatformTimerOffset;
-  Offset = *GtdtPlatformTimerOffset;
-  Index = 0;
+  Offset   = *GtdtPlatformTimerOffset;
+  Index    = 0;
 
   // Parse the specified number of Platform Timer Structures or the GTDT
   // buffer length. Whichever is minimum.
   while ((Index++ < *GtdtPlatformTimerCount) &&
-         (Offset < AcpiTableLength)) {
+         (Offset < AcpiTableLength))
+  {
     // Parse the Platform Timer Header to obtain Length and Type
     ParseAcpi (
@@ -319 +323 @@
     // successfully read.
     if ((PlatformTimerType == NULL) ||
-        (PlatformTimerLength == NULL)) {
+        (PlatformTimerLength == NULL))
+    {
       IncrementErrorCount ();
       Print (
         L"ERROR: Insufficient remaining table buffer length to read the " \
-          L"Platform Timer Structure header. Length = %d.\n",
+        L"Platform Timer Structure header. Length = %d.\n",
         AcpiTableLength - Offset
         );
@@ -331 +336 @@
     // Validate Platform Timer Structure length
     if ((*PlatformTimerLength == 0) ||
-        ((Offset + (*PlatformTimerLength)) > AcpiTableLength)) {
+        ((Offset + (*PlatformTimerLength)) > AcpiTableLength))
+    {
       IncrementErrorCount ();
       Print (
         L"ERROR: Invalid Platform Timer Structure length. " \
-          L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
+        L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
         *PlatformTimerLength,
         Offset,
@@ -344 +350 @@
 
     switch (*PlatformTimerType) {
-      case EFI_ACPI_6_3_GTDT_GT_BLOCK:
+      case EFI_ACPI_6_4_GTDT_GT_BLOCK:
         DumpGTBlock (TimerPtr, *PlatformTimerLength);
         break;
-      case EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG:
+      case EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG:
         DumpWatchdogTimer (TimerPtr, *PlatformTimerLength);
         break;
@@ -360 +366 @@
 
     TimerPtr += *PlatformTimerLength;
-    Offset += *PlatformTimerLength;
+    Offset   += *PlatformTimerLength;
   } // while
 }

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Hmat/HmatParser.c

@@ -22 +22 @@
 
 // Maximum Memory Domain matrix print size.
-#define MAX_MEMORY_DOMAIN_TARGET_PRINT_MATRIX    10
+#define MAX_MEMORY_DOMAIN_TARGET_PRINT_MATRIX  10
 
 // Local variables
-STATIC CONST UINT16*  HmatStructureType;
-STATIC CONST UINT32*  HmatStructureLength;
-
-STATIC CONST UINT32*  NumberInitiatorProximityDomain;
-STATIC CONST UINT32*  NumberTargetProximityDomain;
+STATIC CONST UINT16  *HmatStructureType;
+STATIC CONST UINT32  *HmatStructureLength;
+
+STATIC CONST UINT32  *NumberInitiatorProximityDomain;
+STATIC CONST UINT32  *NumberTargetProximityDomain;
 STATIC CONST
-EFI_ACPI_6_3_HMAT_STRUCTURE_SYSTEM_LOCALITY_LATENCY_AND_BANDWIDTH_INFO_FLAGS*
-SllbiFlags;
-
-STATIC CONST UINT8*   SllbiDataType;
-STATIC CONST UINT16*  NumberSMBIOSHandles;
-
-STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
+EFI_ACPI_6_4_HMAT_STRUCTURE_SYSTEM_LOCALITY_LATENCY_AND_BANDWIDTH_INFO_FLAGS *
+  SllbiFlags;
+
+STATIC CONST UINT8   *SllbiDataType;
+STATIC CONST UINT16  *NumberSMBIOSHandles;
+
+STATIC ACPI_DESCRIPTION_HEADER_INFO  AcpiHdrInfo;
 
 /**
   Names of System Locality Latency Bandwidth Information (SLLBI) data types
 **/
-STATIC CONST CHAR16* SllbiNames[] = {
+STATIC CONST CHAR16  *SllbiNames[] = {
   L"Access %sLatency%s",
   L"Read %sLatency%s",
@@ -62 +62 @@
 EFIAPI
 ValidateCacheAttributes (
-  IN UINT8* Ptr,
-  IN VOID*  Context
+  IN UINT8  *Ptr,
+  IN VOID   *Context
   )
 {
-  EFI_ACPI_6_3_HMAT_STRUCTURE_MEMORY_SIDE_CACHE_INFO_CACHE_ATTRIBUTES*
-  Attributes;
+  EFI_ACPI_6_4_HMAT_STRUCTURE_MEMORY_SIDE_CACHE_INFO_CACHE_ATTRIBUTES *
+    Attributes;
 
   Attributes =
-    (EFI_ACPI_6_3_HMAT_STRUCTURE_MEMORY_SIDE_CACHE_INFO_CACHE_ATTRIBUTES*)Ptr;
+    (EFI_ACPI_6_4_HMAT_STRUCTURE_MEMORY_SIDE_CACHE_INFO_CACHE_ATTRIBUTES *)Ptr;
 
   if (Attributes->TotalCacheLevels > 0x3) {
@@ -79 +79 @@
       );
   }
+
   if (Attributes->CacheLevel > 0x3) {
     IncrementErrorCount ();
@@ -86 +87 @@
       );
   }
+
   if (Attributes->CacheAssociativity > 0x2) {
     IncrementErrorCount ();
@@ -93 +95 @@
       );
   }
+
   if (Attributes->WritePolicy > 0x2) {
     IncrementErrorCount ();
@@ -112 +115 @@
 EFIAPI
 DumpCacheAttributes (
-  IN CONST CHAR16* Format OPTIONAL,
-  IN UINT8*        Ptr
+  IN CONST CHAR16  *Format OPTIONAL,
+  IN UINT8         *Ptr
   )
 {
-  EFI_ACPI_6_3_HMAT_STRUCTURE_MEMORY_SIDE_CACHE_INFO_CACHE_ATTRIBUTES*
-  Attributes;
+  EFI_ACPI_6_4_HMAT_STRUCTURE_MEMORY_SIDE_CACHE_INFO_CACHE_ATTRIBUTES *
+    Attributes;
 
   Attributes =
-    (EFI_ACPI_6_3_HMAT_STRUCTURE_MEMORY_SIDE_CACHE_INFO_CACHE_ATTRIBUTES*)Ptr;
+    (EFI_ACPI_6_4_HMAT_STRUCTURE_MEMORY_SIDE_CACHE_INFO_CACHE_ATTRIBUTES *)Ptr;
 
   Print (L"\n");
@@ -138 +141 @@
   An ACPI_PARSER array describing the ACPI HMAT Table.
 */
-STATIC CONST ACPI_PARSER HmatParser[] = {
+STATIC CONST ACPI_PARSER  HmatParser[] = {
   PARSE_ACPI_HEADER (&AcpiHdrInfo),
-  {L"Reserved", 4, 36, NULL, NULL, NULL, NULL, NULL}
+  { L"Reserved",                   4,36, NULL, NULL, NULL, NULL, NULL }
 };
 
@@ -146 +149 @@
   An ACPI_PARSER array describing the HMAT structure header.
 */
-STATIC CONST ACPI_PARSER HmatStructureHeaderParser[] = {
-  {L"Type", 2, 0, NULL, NULL, (VOID**)&HmatStructureType, NULL, NULL},
-  {L"Reserved", 2, 2, NULL, NULL, NULL, NULL, NULL},
-  {L"Length", 4, 4, NULL, NULL, (VOID**)&HmatStructureLength, NULL, NULL}
+STATIC CONST ACPI_PARSER  HmatStructureHeaderParser[] = {
+  { L"Type",     2, 0, NULL, NULL, (VOID **)&HmatStructureType,   NULL, NULL },
+  { L"Reserved", 2, 2, NULL, NULL, NULL,                          NULL, NULL },
+  { L"Length",   4, 4, NULL, NULL, (VOID **)&HmatStructureLength, NULL, NULL }
 };
 
@@ -156 +159 @@
   Structure - Type 0.
 */
-STATIC CONST ACPI_PARSER MemProximityDomainAttributeParser[] = {
-  {L"Type", 2, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 4, 4, L"%d", NULL, NULL, NULL, NULL},
-  {L"Flags", 2, 8, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 2, 10, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Proximity Dom for initiator", 4, 12, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Proximity Dom for memory", 4, 16, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 4, 20, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 8, 24, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Reserved", 8, 32, L"0x%lx", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  MemProximityDomainAttributeParser[] = {
+  { L"Type",                        2, 0,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Reserved",                    2, 2,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Length",                      4, 4,  L"%d",    NULL, NULL, NULL, NULL },
+  { L"Flags",                       2, 8,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Reserved",                    2, 10, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Proximity Dom for initiator", 4, 12, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Proximity Dom for memory",    4, 16, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Reserved",                    4, 20, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Reserved",                    8, 24, L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"Reserved",                    8, 32, L"0x%lx", NULL, NULL, NULL, NULL }
 };
 
@@ -173 +176 @@
   Information Structure - Type 1.
 */
-STATIC CONST ACPI_PARSER SllbiParser[] = {
-  {L"Type", 2, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 4, 4, L"%d", NULL, NULL, NULL, NULL},
-  {L"Flags", 1, 8, L"0x%x", NULL, (VOID**)&SllbiFlags, NULL, NULL},
-  {L"Data type", 1, 9, L"0x%x", NULL, (VOID**)&SllbiDataType, NULL, NULL},
-  {L"Reserved", 2, 10, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Initiator Proximity Dom Count", 4, 12, L"%d", NULL,
-    (VOID**)&NumberInitiatorProximityDomain, NULL, NULL},
-  {L"Target Proximity Dom Count", 4, 16, L"%d", NULL,
-    (VOID**)&NumberTargetProximityDomain, NULL, NULL},
-  {L"Reserved", 4, 20, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Entry Base Unit", 8, 24, L"0x%lx", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  SllbiParser[] = {
+  { L"Type",                          2, 0,  L"0x%x",  NULL, NULL,                    NULL, NULL },
+  { L"Reserved",                      2, 2,  L"0x%x",  NULL, NULL,                    NULL, NULL },
+  { L"Length",                        4, 4,  L"%d",    NULL, NULL,                    NULL, NULL },
+  { L"Flags",                         1, 8,  L"0x%x",  NULL, (VOID **)&SllbiFlags,    NULL, NULL },
+  { L"Data type",                     1, 9,  L"0x%x",  NULL, (VOID **)&SllbiDataType, NULL, NULL },
+  { L"Min Transfer Size",             1, 10, L"%d",    NULL, NULL,                    NULL, NULL },
+  { L"Reserved",                      1, 11, L"0x%x",  NULL, NULL,                    NULL, NULL },
+  { L"Initiator Proximity Dom Count", 4, 12, L"%d",    NULL,
+    (VOID **)&NumberInitiatorProximityDomain, NULL, NULL },
+  { L"Target Proximity Dom Count",    4, 16, L"%d",    NULL,
+    (VOID **)&NumberTargetProximityDomain, NULL, NULL },
+  { L"Reserved",                      4, 20, L"0x%x",  NULL, NULL,                    NULL, NULL },
+  { L"Entry Base Unit",               8, 24, L"0x%lx", NULL, NULL,                    NULL, NULL }
   // initiator Proximity Domain list ...
   // target Proximity Domain list ...
@@ -195 +199 @@
   Structure - Type 2.
 */
-STATIC CONST ACPI_PARSER MemSideCacheInfoParser[] = {
-  {L"Type", 2, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 4, 4, L"%d", NULL, NULL, NULL, NULL},
-  {L"Proximity Dom for memory", 4, 8, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 4, 12, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Memory Side Cache Size", 8, 16, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Cache Attributes", 4, 24, NULL, DumpCacheAttributes, NULL,
-    ValidateCacheAttributes, NULL},
-  {L"Reserved", 2, 28, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"SMBIOS Handle Count", 2, 30, L"%d", NULL,
-    (VOID**)&NumberSMBIOSHandles, NULL, NULL}
+STATIC CONST ACPI_PARSER  MemSideCacheInfoParser[] = {
+  { L"Type",                     2, 0,  L"0x%x",  NULL,                NULL, NULL, NULL },
+  { L"Reserved",                 2, 2,  L"0x%x",  NULL,                NULL, NULL, NULL },
+  { L"Length",                   4, 4,  L"%d",    NULL,                NULL, NULL, NULL },
+  { L"Proximity Dom for memory", 4, 8,  L"0x%x",  NULL,                NULL, NULL, NULL },
+  { L"Reserved",                 4, 12, L"0x%x",  NULL,                NULL, NULL, NULL },
+  { L"Memory Side Cache Size",   8, 16, L"0x%lx", NULL,                NULL, NULL, NULL },
+  { L"Cache Attributes",         4, 24, NULL,     DumpCacheAttributes, NULL,
+    ValidateCacheAttributes, NULL },
+  { L"Reserved",                 2, 28, L"0x%x",  NULL,                NULL, NULL, NULL },
+  { L"SMBIOS Handle Count",      2, 30, L"%d",    NULL,
+    (VOID **)&NumberSMBIOSHandles, NULL, NULL }
   // SMBIOS handles List ...
 };
@@ -222 +226 @@
 VOID
 DumpMpda (
-  IN UINT8* Ptr,
-  IN UINT32 Length
+  IN UINT8   *Ptr,
+  IN UINT32  Length
   )
 {
@@ -248 +252 @@
 VOID
 DumpSllbi (
-  IN UINT8* Ptr,
-  IN UINT32 Length
+  IN UINT8   *Ptr,
+  IN UINT32  Length
   )
 {
-  CONST UINT32* InitiatorProximityDomainList;
-  CONST UINT32* TargetProximityDomainList;
-  CONST UINT16* LatencyBandwidthMatrix;
+  CONST UINT32  *InitiatorProximityDomainList;
+  CONST UINT32  *TargetProximityDomainList;
+  CONST UINT16  *LatencyBandwidthMatrix;
   UINT32        Offset;
   CHAR16        Buffer[OUTPUT_FIELD_COLUMN_WIDTH];
@@ -278 +282 @@
       (SllbiDataType == NULL)                  ||
       (NumberInitiatorProximityDomain == NULL) ||
-      (NumberTargetProximityDomain == NULL)) {
+      (NumberTargetProximityDomain == NULL))
+  {
     IncrementErrorCount ();
     Print (
       L"ERROR: Insufficient remaining table buffer length to read the " \
-        L"SLLBI structure header. Length = %d.\n",
+      L"SLLBI structure header. Length = %d.\n",
       Length
       );
@@ -306 +311 @@
   }
 
-  InitiatorProximityDomainList = (UINT32*) (Ptr + Offset);
-  TargetProximityDomainList = InitiatorProximityDomainList +
-                              *NumberInitiatorProximityDomain;
-  LatencyBandwidthMatrix = (UINT16*) (TargetProximityDomainList +
+  InitiatorProximityDomainList = (UINT32 *)(Ptr + Offset);
+  TargetProximityDomainList    = InitiatorProximityDomainList +
+                                 *NumberInitiatorProximityDomain;
+  LatencyBandwidthMatrix = (UINT16 *)(TargetProximityDomainList +
                                       *NumberTargetProximityDomain);
 
@@ -350 +355 @@
     return;
   }
+
   StrCpyS (Buffer, sizeof (Buffer), SllbiNames[*SllbiDataType]);
 
@@ -381 +387 @@
         );
       return;
-
   } // switch
 
@@ -400 +405 @@
     for (IndexTarget = 0;
          IndexTarget < *NumberTargetProximityDomain;
-         IndexTarget++) {
+         IndexTarget++)
+    {
       Print (L"    %2d", IndexTarget);
     }
@@ -407 +413 @@
     for (IndexTarget = 0;
          IndexTarget < *NumberTargetProximityDomain;
-         IndexTarget++) {
+         IndexTarget++)
+    {
       Print (L"------");
     }
+
     Print (L"\n");
 
@@ -415 +423 @@
     for (IndexInitiator = 0;
          IndexInitiator < *NumberInitiatorProximityDomain;
-         IndexInitiator++) {
+         IndexInitiator++)
+    {
       Print (L"      %2d |", IndexInitiator);
       for (IndexTarget = 0;
            IndexTarget < *NumberTargetProximityDomain;
-           IndexTarget++) {
+           IndexTarget++)
+      {
         Print (
           L" %5d",
@@ -425 +435 @@
           );
       } // for Target
+
       Print (L"\n");
       TargetStartOffset += (*NumberTargetProximityDomain);
     } // for Initiator
+
     Print (L"\n");
   } else {
@@ -441 +453 @@
     for (IndexInitiator = 0;
          IndexInitiator < *NumberInitiatorProximityDomain;
-         IndexInitiator++) {
+         IndexInitiator++)
+    {
       for (IndexTarget = 0;
            IndexTarget < *NumberTargetProximityDomain;
-           IndexTarget++) {
+           IndexTarget++)
+      {
         UnicodeSPrint (
           SecondBuffer,
@@ -459 +473 @@
           );
       } // for Target
+
       TargetStartOffset += (*NumberTargetProximityDomain);
     } // for Initiator
@@ -474 +489 @@
 VOID
 DumpMsci (
-  IN UINT8* Ptr,
-  IN UINT32 Length
+  IN UINT8   *Ptr,
+  IN UINT32  Length
   )
 {
-  CONST UINT16* SMBIOSHandlesList;
+  CONST UINT16  *SMBIOSHandlesList;
   CHAR16        Buffer[OUTPUT_FIELD_COLUMN_WIDTH];
   UINT32        Offset;
@@ -498 +513 @@
     Print (
       L"ERROR: Insufficient remaining table buffer length to read the " \
-        L"MSCI structure header. Length = %d.\n",
+      L"MSCI structure header. Length = %d.\n",
       Length
       );
@@ -515 +530 @@
   }
 
-  SMBIOSHandlesList = (UINT16*) (Ptr + Offset);
+  SMBIOSHandlesList = (UINT16 *)(Ptr + Offset);
 
   for (Index = 0; Index < *NumberSMBIOSHandles; Index++) {
@@ -553 +568 @@
 EFIAPI
 ParseAcpiHmat (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
   )
 {
-  UINT32 Offset;
-  UINT8* HmatStructurePtr;
+  UINT32  Offset;
+  UINT8   *HmatStructurePtr;
 
   if (!Trace) {
@@ -591 +606 @@
     // successfully read.
     if ((HmatStructureType == NULL) ||
-        (HmatStructureLength == NULL)) {
+        (HmatStructureLength == NULL))
+    {
       IncrementErrorCount ();
       Print (
         L"ERROR: Insufficient remaining table buffer length to read the " \
-          L"HMAT structure header. Length = %d.\n",
+        L"HMAT structure header. Length = %d.\n",
         AcpiTableLength - Offset
         );
@@ -603 +619 @@
     // Validate HMAT Structure length.
     if ((*HmatStructureLength == 0) ||
-        ((Offset + (*HmatStructureLength)) > AcpiTableLength)) {
+        ((Offset + (*HmatStructureLength)) > AcpiTableLength))
+    {
       IncrementErrorCount ();
       Print (
         L"ERROR: Invalid HMAT Structure length. " \
-          L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
+        L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
         *HmatStructureLength,
         Offset,
@@ -616 +633 @@
 
     switch (*HmatStructureType) {
-      case EFI_ACPI_6_3_HMAT_TYPE_MEMORY_PROXIMITY_DOMAIN_ATTRIBUTES:
+      case EFI_ACPI_6_4_HMAT_TYPE_MEMORY_PROXIMITY_DOMAIN_ATTRIBUTES:
         DumpMpda (
           HmatStructurePtr,
@@ -622 +639 @@
           );
         break;
-      case EFI_ACPI_6_3_HMAT_TYPE_SYSTEM_LOCALITY_LATENCY_AND_BANDWIDTH_INFO:
+      case EFI_ACPI_6_4_HMAT_TYPE_SYSTEM_LOCALITY_LATENCY_AND_BANDWIDTH_INFO:
         DumpSllbi (
           HmatStructurePtr,
@@ -628 +645 @@
           );
         break;
-      case EFI_ACPI_6_3_HMAT_TYPE_MEMORY_SIDE_CACHE_INFO:
-         DumpMsci (
+      case EFI_ACPI_6_4_HMAT_TYPE_MEMORY_SIDE_CACHE_INFO:
+        DumpMsci (
           HmatStructurePtr,
           *HmatStructureLength
@@ -638 +655 @@
         Print (
           L"ERROR: Unknown HMAT structure:"
-            L" Type = %d, Length = %d\n",
+          L" Type = %d, Length = %d\n",
           *HmatStructureType,
           *HmatStructureLength
@@ -646 +663 @@
 
     HmatStructurePtr += *HmatStructureLength;
-    Offset += *HmatStructureLength;
+    Offset           += *HmatStructureLength;
   } // while
 }

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c

@@ -2 +2 @@
   IORT table parser
 
-  Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.
+  Copyright (c) 2016 - 2022, Arm Limited. All rights reserved.
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @par Reference(s):
-    - IO Remapping Table, Platform Design Document, Revision D, March 2018
+    - IO Remapping Table, Platform Design Document, Revision E.d, Feb 2022
+      (https://developer.arm.com/documentation/den0049/)
+
+  @par Glossary:
+    - Ref  - Reference
+    - Desc - Descriptor
 **/
 
@@ -17 +22 @@
 
 // Local variables
-STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
-
-STATIC CONST UINT32* IortNodeCount;
-STATIC CONST UINT32* IortNodeOffset;
-
-STATIC CONST UINT8*  IortNodeType;
-STATIC CONST UINT16* IortNodeLength;
-STATIC CONST UINT32* IortIdMappingCount;
-STATIC CONST UINT32* IortIdMappingOffset;
-
-STATIC CONST UINT32* InterruptContextCount;
-STATIC CONST UINT32* InterruptContextOffset;
-STATIC CONST UINT32* PmuInterruptCount;
-STATIC CONST UINT32* PmuInterruptOffset;
-
-STATIC CONST UINT32* ItsCount;
+STATIC ACPI_DESCRIPTION_HEADER_INFO  AcpiHdrInfo;
+
+STATIC CONST UINT32  *IortNodeCount;
+STATIC CONST UINT32  *IortNodeOffset;
+
+STATIC CONST UINT8   *IortNodeType;
+STATIC CONST UINT16  *IortNodeLength;
+STATIC CONST UINT8   *IortNodeRevision;
+STATIC CONST UINT32  *IortIdMappingCount;
+STATIC CONST UINT32  *IortIdMappingOffset;
+
+STATIC CONST UINT32  *InterruptContextCount;
+STATIC CONST UINT32  *InterruptContextOffset;
+STATIC CONST UINT32  *PmuInterruptCount;
+STATIC CONST UINT32  *PmuInterruptOffset;
+
+STATIC CONST UINT32  *ItsCount;
+
+STATIC CONST UINT32  *RmrMemDescCount;
+STATIC CONST UINT32  *RmrMemDescOffset;
 
 /**
@@ -45 +54 @@
 EFIAPI
 ValidateItsIdMappingCount (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-  )
-{
-  if (*(UINT32*)Ptr != 0) {
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  if (*(UINT32 *)Ptr != 0) {
     IncrementErrorCount ();
     Print (L"\nERROR: IORT ID Mapping count must be zero.");
@@ -67 +76 @@
 EFIAPI
 ValidatePmcgIdMappingCount (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-  )
-{
-  if (*(UINT32*)Ptr > 1) {
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  if (*(UINT32 *)Ptr > 1) {
     IncrementErrorCount ();
     Print (L"\nERROR: IORT ID Mapping count must not be greater than 1.");
@@ -88 +97 @@
 EFIAPI
 ValidateItsIdArrayReference (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-  )
-{
-  if (*(UINT32*)Ptr != 0) {
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  if (*(UINT32 *)Ptr != 0) {
     IncrementErrorCount ();
     Print (L"\nERROR: IORT ID Mapping offset must be zero.");
+  }
+}
+
+/**
+  This function validates that the Physical Range address or length is not zero
+  and is 64K aligned.
+
+  @param [in] Ptr     Pointer to the start of the field data.
+  @param [in] Context Pointer to context specific information e.g. this
+                      could be a pointer to the ACPI table header.
+**/
+STATIC
+VOID
+EFIAPI
+ValidatePhysicalRange (
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  UINT64  Value;
+
+  Value = *(UINT64 *)Ptr;
+  if ((Value == 0) || ((Value & (SIZE_64KB - 1)) != 0)) {
+    IncrementErrorCount ();
+    Print (L"\nERROR: Physical Range must be 64K aligned and cannot be zero.");
+  }
+}
+
+/**
+  This function validates that the RMR memory range descriptor count.
+
+  @param [in] Ptr     Pointer to the start of the field data.
+  @param [in] Context Pointer to context specific information e.g. this
+                      could be a pointer to the ACPI table header.
+**/
+STATIC
+VOID
+EFIAPI
+ValidateRmrMemDescCount (
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  if (*(UINT32 *)Ptr == 0) {
+    IncrementErrorCount ();
+    Print (L"\nERROR: Memory Range Descriptor count must be >=1.");
   }
 }
@@ -106 +161 @@
                                          validating the ID Array reference.
 **/
-#define PARSE_IORT_NODE_HEADER(ValidateIdMappingCount,                   \
-                               ValidateIdArrayReference)                 \
-  { L"Type", 1, 0, L"%d", NULL, (VOID**)&IortNodeType, NULL, NULL },     \
-  { L"Length", 2, 1, L"%d", NULL, (VOID**)&IortNodeLength, NULL, NULL }, \
-  { L"Revision", 1, 3, L"%d", NULL, NULL, NULL, NULL },                  \
-  { L"Reserved", 4, 4, L"0x%x", NULL, NULL, NULL, NULL },                \
-  { L"Number of ID mappings", 4, 8, L"%d", NULL,                         \
-    (VOID**)&IortIdMappingCount, ValidateIdMappingCount, NULL },         \
-  { L"Reference to ID Array", 4, 12, L"0x%x", NULL,                      \
+#define PARSE_IORT_NODE_HEADER(ValidateIdMappingCount,                        \
+                               ValidateIdArrayReference)                      \
+  { L"Type", 1, 0, L"%d", NULL, (VOID**)&IortNodeType, NULL, NULL },          \
+  { L"Length", 2, 1, L"%d", NULL, (VOID**)&IortNodeLength, NULL, NULL },      \
+  { L"Revision", 1, 3, L"%d", NULL, (VOID**)&IortNodeRevision, NULL, NULL },  \
+  { L"Identifier", 4, 4, L"0x%x", NULL, NULL, NULL, NULL },                   \
+  { L"Number of ID mappings", 4, 8, L"%d", NULL,                              \
+    (VOID**)&IortIdMappingCount, ValidateIdMappingCount, NULL },              \
+  { L"Reference to ID Array", 4, 12, L"0x%x", NULL,                           \
     (VOID**)&IortIdMappingOffset, ValidateIdArrayReference, NULL }
 
@@ -120 +175 @@
   An ACPI_PARSER array describing the ACPI IORT Table
 **/
-STATIC CONST ACPI_PARSER IortParser[] = {
+STATIC CONST ACPI_PARSER  IortParser[] = {
   PARSE_ACPI_HEADER (&AcpiHdrInfo),
-  {L"Number of IORT Nodes", 4, 36, L"%d", NULL,
-   (VOID**)&IortNodeCount, NULL, NULL},
-  {L"Offset to Array of IORT Nodes", 4, 40, L"0x%x", NULL,
-   (VOID**)&IortNodeOffset, NULL, NULL},
-  {L"Reserved", 4, 44, L"0x%x", NULL, NULL, NULL, NULL}
+  { L"Number of IORT Nodes",       4,     36, L"%d",   NULL,
+    (VOID **)&IortNodeCount,       NULL,  NULL },
+  { L"Offset to Array of IORT Nodes",4,     40, L"0x%x", NULL,
+    (VOID **)&IortNodeOffset,      NULL,  NULL },
+  { L"Reserved",                   4,     44, L"0x%x", NULL,NULL,NULL, NULL }
 };
 
@@ -132 +187 @@
   An ACPI_PARSER array describing the IORT node header structure.
 **/
-STATIC CONST ACPI_PARSER IortNodeHeaderParser[] = {
+STATIC CONST ACPI_PARSER  IortNodeHeaderParser[] = {
   PARSE_IORT_NODE_HEADER (NULL, NULL)
 };
@@ -139 +194 @@
   An ACPI_PARSER array describing the IORT SMMUv1/2 node.
 **/
-STATIC CONST ACPI_PARSER IortNodeSmmuV1V2Parser[] = {
+STATIC CONST ACPI_PARSER  IortNodeSmmuV1V2Parser[] = {
+  PARSE_IORT_NODE_HEADER (NULL,       NULL),
+  { L"Base Address",                  8,    16,  L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"Span",                          8,    24,  L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"Model",                         4,    32,  L"%d",    NULL, NULL, NULL, NULL },
+  { L"Flags",                         4,    36,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Global Interrupt Array Ref",    4,    40,  L"0x%x",  NULL, NULL, NULL,
+    NULL },
+  { L"Number of context interrupts",  4,    44,  L"%d",    NULL,
+    (VOID **)&InterruptContextCount,  NULL, NULL },
+  { L"Context Interrupt Array Ref",   4,    48,  L"0x%x",  NULL,
+    (VOID **)&InterruptContextOffset, NULL, NULL },
+  { L"Number of PMU Interrupts",      4,    52,  L"%d",    NULL,
+    (VOID **)&PmuInterruptCount,      NULL, NULL },
+  { L"PMU Interrupt Array Ref",       4,    56,  L"0x%x",  NULL,
+    (VOID **)&PmuInterruptOffset,     NULL, NULL },
+
+  // Interrupt Array
+  { L"SMMU_NSgIrpt",                  4,    60,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"SMMU_NSgIrpt interrupt flags",  4,    64,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"SMMU_NSgCfgIrpt",               4,    68,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"SMMU_NSgCfgIrpt interrupt flags",4,    72,  L"0x%x",  NULL, NULL, NULL, NULL }
+};
+
+/**
+  An ACPI_PARSER array describing the SMMUv1/2 Node Interrupt Array.
+**/
+STATIC CONST ACPI_PARSER  InterruptArrayParser[] = {
+  { L"Interrupt GSIV", 4, 0, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Flags",          4, 4, L"0x%x", NULL, NULL, NULL, NULL }
+};
+
+/**
+  An ACPI_PARSER array describing the IORT ID Mapping.
+**/
+STATIC CONST ACPI_PARSER  IortNodeIdMappingParser[] = {
+  { L"Input base",       4, 0,  L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Number of IDs",    4, 4,  L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Output base",      4, 8,  L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Output reference", 4, 12, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Flags",            4, 16, L"0x%x", NULL, NULL, NULL, NULL }
+};
+
+/**
+  An ACPI_PARSER array describing the IORT SMMUv3 node.
+**/
+STATIC CONST ACPI_PARSER  IortNodeSmmuV3Parser[] = {
   PARSE_IORT_NODE_HEADER (NULL, NULL),
-  {L"Base Address", 8, 16, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Span", 8, 24, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Model", 4, 32, L"%d", NULL, NULL, NULL, NULL},
-  {L"Flags", 4, 36, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reference to Global Interrupt Array", 4, 40, L"0x%x", NULL, NULL, NULL,
-   NULL},
-  {L"Number of context interrupts", 4, 44, L"%d", NULL,
-   (VOID**)&InterruptContextCount, NULL, NULL},
-  {L"Reference to Context Interrupt Array", 4, 48, L"0x%x", NULL,
-   (VOID**)&InterruptContextOffset, NULL, NULL},
-  {L"Number of PMU Interrupts", 4, 52, L"%d", NULL,
-   (VOID**)&PmuInterruptCount, NULL, NULL},
-  {L"Reference to PMU Interrupt Array", 4, 56, L"0x%x", NULL,
-   (VOID**)&PmuInterruptOffset, NULL, NULL},
-
-  // Interrupt Array
-  {L"SMMU_NSgIrpt", 4, 60, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"SMMU_NSgIrpt interrupt flags", 4, 64, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"SMMU_NSgCfgIrpt", 4, 68, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"SMMU_NSgCfgIrpt interrupt flags", 4, 72, L"0x%x", NULL, NULL, NULL, NULL}
-};
-
-/**
-  An ACPI_PARSER array describing the SMMUv1/2 Node Interrupt Array.
-**/
-STATIC CONST ACPI_PARSER InterruptArrayParser[] = {
-  {L"Interrupt GSIV", 4, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Flags", 4, 4, L"0x%x", NULL, NULL, NULL, NULL}
-};
-
-/**
-  An ACPI_PARSER array describing the IORT ID Mapping.
-**/
-STATIC CONST ACPI_PARSER IortNodeIdMappingParser[] = {
-  {L"Input base", 4, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Number of IDs", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Output base", 4, 8, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Output reference", 4, 12, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Flags", 4, 16, L"0x%x", NULL, NULL, NULL, NULL}
-};
-
-/**
-  An ACPI_PARSER array describing the IORT SMMUv3 node.
-**/
-STATIC CONST ACPI_PARSER IortNodeSmmuV3Parser[] = {
-  PARSE_IORT_NODE_HEADER (NULL, NULL),
-  {L"Base Address", 8, 16, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Flags", 4, 24, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 4, 28, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"VATOS Address", 8, 32, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Model", 4, 40, L"%d", NULL, NULL, NULL, NULL},
-  {L"Event", 4, 44, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PRI", 4, 48, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"GERR", 4, 52, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Sync", 4, 56, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Proximity domain", 4, 60, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Device ID mapping index", 4, 64, L"%d", NULL, NULL, NULL, NULL}
+  { L"Base Address",            8,    16,  L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"Flags",                   4,    24,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Reserved",                4,    28,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"VATOS Address",           8,    32,  L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"Model",                   4,    40,  L"%d",    NULL, NULL, NULL, NULL },
+  { L"Event",                   4,    44,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"PRI",                     4,    48,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"GERR",                    4,    52,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Sync",                    4,    56,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Proximity domain",        4,    60,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Device ID mapping index", 4,    64,  L"%d",    NULL, NULL, NULL, NULL }
 };
 
@@ -203 +258 @@
   An ACPI_PARSER array describing the IORT ITS node.
 **/
-STATIC CONST ACPI_PARSER IortNodeItsParser[] = {
+STATIC CONST ACPI_PARSER  IortNodeItsParser[] = {
   PARSE_IORT_NODE_HEADER (
     ValidateItsIdMappingCount,
     ValidateItsIdArrayReference
     ),
-  {L"Number of ITSs", 4, 16, L"%d", NULL, (VOID**)&ItsCount, NULL}
+  { L"Number of ITSs",        4,16, L"%d", NULL, (VOID **)&ItsCount, NULL }
 };
 
@@ -214 +269 @@
   An ACPI_PARSER array describing the ITS ID.
 **/
-STATIC CONST ACPI_PARSER ItsIdParser[] = {
+STATIC CONST ACPI_PARSER  ItsIdParser[] = {
   { L"GIC ITS Identifier", 4, 0, L"%d", NULL, NULL, NULL }
 };
@@ -221 +276 @@
   An ACPI_PARSER array describing the IORT Names Component node.
 **/
-STATIC CONST ACPI_PARSER IortNodeNamedComponentParser[] = {
+STATIC CONST ACPI_PARSER  IortNodeNamedComponentParser[] = {
   PARSE_IORT_NODE_HEADER (NULL, NULL),
-  {L"Node Flags", 4, 16, L"%d", NULL, NULL, NULL, NULL},
-  {L"Memory access properties", 8, 20, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Device memory address size limit", 1, 28, L"%d", NULL, NULL, NULL, NULL}
+  { L"Node Flags",              4,    16,  L"%d",    NULL, NULL, NULL, NULL },
+  { L"Memory access properties",8,    20,  L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"Device memory address size limit",1,    28,  L"%d",    NULL, NULL, NULL, NULL }
 };
 
@@ -231 +286 @@
   An ACPI_PARSER array describing the IORT Root Complex node.
 **/
-STATIC CONST ACPI_PARSER IortNodeRootComplexParser[] = {
+STATIC CONST ACPI_PARSER  IortNodeRootComplexParser[] = {
   PARSE_IORT_NODE_HEADER (NULL, NULL),
-  {L"Memory access properties", 8, 16, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"ATS Attribute", 4, 24, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PCI Segment number", 4, 28, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Memory access size limit", 1, 32, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 3, 33, L"%x %x %x", Dump3Chars, NULL, NULL, NULL}
+  { L"Memory access properties",8,    16,  L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"ATS Attribute",           4,    24,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"PCI Segment number",      4,    28,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Memory access size limit",1,    32,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"PASID capabilities",      2,    33,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Reserved",                1,    35,  L"%x",    NULL, NULL, NULL, NULL },
+  { L"Flags",                   4,    36,  L"0x%x",  NULL, NULL, NULL, NULL },
 };
 
@@ -243 +300 @@
   An ACPI_PARSER array describing the IORT PMCG node.
 **/
-STATIC CONST ACPI_PARSER IortNodePmcgParser[] = {
+STATIC CONST ACPI_PARSER  IortNodePmcgParser[] = {
   PARSE_IORT_NODE_HEADER (ValidatePmcgIdMappingCount, NULL),
-  {L"Page 0 Base Address", 8, 16, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Overflow interrupt GSIV", 4, 24, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Node reference", 4, 28, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Page 1 Base Address", 8, 32, L"0x%lx", NULL, NULL, NULL, NULL}
+  { L"Page 0 Base Address",                           8,    16,  L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"Overflow interrupt GSIV",                       4,    24,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Node reference",                                4,    28,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Page 1 Base Address",                           8,    32,  L"0x%lx", NULL, NULL, NULL, NULL }
+};
+
+/**
+  An ACPI_PARSER array describing the IORT RMR node.
+**/
+STATIC CONST ACPI_PARSER  IortNodeRmrParser[] = {
+  PARSE_IORT_NODE_HEADER (NULL, NULL),
+  { L"Flags",                   4,                      16,  L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Memory Range Desc count", 4,                      20,  L"%d",   NULL,
+    (VOID **)&RmrMemDescCount,  ValidateRmrMemDescCount,NULL },
+  { L"Memory Range Desc Ref",   4,                      24,  L"0x%x", NULL,
+    (VOID **)&RmrMemDescOffset, NULL,                   NULL }
+};
+
+/**
+  An ACPI_PARSER array describing the IORT RMR Memory Range Descriptor.
+**/
+STATIC CONST ACPI_PARSER  IortNodeRmrMemRangeDescParser[] = {
+  { L"Physical Range offset", 8, 0,  L"0x%lx", NULL, NULL, ValidatePhysicalRange,
+    NULL },
+  { L"Physical Range length", 8, 8,  L"0x%lx", NULL, NULL, ValidatePhysicalRange,
+    NULL },
+  { L"Reserved",              4, 16, L"0x%x",  NULL, NULL, NULL,                 NULL}
 };
 
@@ -261 +341 @@
 VOID
 DumpIortNodeIdMappings (
-  IN UINT8* Ptr,
-  IN UINT32 Length,
-  IN UINT32 MappingCount
-  )
-{
-  UINT32 Index;
-  UINT32 Offset;
-  CHAR8  Buffer[40];  // Used for AsciiName param of ParseAcpi
-
-  Index = 0;
+  IN UINT8   *Ptr,
+  IN UINT32  Length,
+  IN UINT32  MappingCount
+  )
+{
+  UINT32  Index;
+  UINT32  Offset;
+  CHAR8   Buffer[40]; // Used for AsciiName param of ParseAcpi
+
+  Index  = 0;
   Offset = 0;
 
   while ((Index < MappingCount) &&
-         (Offset < Length)) {
+         (Offset < Length))
+  {
     AsciiSPrint (
       Buffer,
@@ -305 +386 @@
 VOID
 DumpIortNodeSmmuV1V2 (
-  IN UINT8* Ptr,
-  IN UINT16 Length,
-  IN UINT32 MappingCount,
-  IN UINT32 MappingOffset
-  )
-{
-  UINT32 Index;
-  UINT32 Offset;
-  CHAR8  Buffer[50];  // Used for AsciiName param of ParseAcpi
+  IN UINT8   *Ptr,
+  IN UINT16  Length,
+  IN UINT32  MappingCount,
+  IN UINT32  MappingOffset
+  )
+{
+  UINT32  Index;
+  UINT32  Offset;
+  CHAR8   Buffer[50]; // Used for AsciiName param of ParseAcpi
 
   ParseAcpi (
@@ -329 +410 @@
       (InterruptContextOffset == NULL)  ||
       (PmuInterruptCount == NULL)       ||
-      (PmuInterruptOffset == NULL)) {
+      (PmuInterruptOffset == NULL))
+  {
     IncrementErrorCount ();
     Print (
@@ -339 +421 @@
 
   Offset = *InterruptContextOffset;
-  Index = 0;
+  Index  = 0;
 
   while ((Index < *InterruptContextCount) &&
-         (Offset < Length)) {
+         (Offset < Length))
+  {
     AsciiSPrint (
       Buffer,
@@ -361 +444 @@
 
   Offset = *PmuInterruptOffset;
-  Index = 0;
+  Index  = 0;
 
   while ((Index < *PmuInterruptCount) &&
-         (Offset < Length)) {
+         (Offset < Length))
+  {
     AsciiSPrint (
       Buffer,
@@ -401 +485 @@
 VOID
 DumpIortNodeSmmuV3 (
-  IN UINT8* Ptr,
-  IN UINT16 Length,
-  IN UINT32 MappingCount,
-  IN UINT32 MappingOffset
+  IN UINT8   *Ptr,
+  IN UINT16  Length,
+  IN UINT32  MappingCount,
+  IN UINT32  MappingOffset
   )
 {
@@ -432 +516 @@
 VOID
 DumpIortNodeIts (
-  IN UINT8* Ptr,
-  IN UINT16 Length
-  )
-{
-  UINT32 Offset;
-  UINT32 Index;
-  CHAR8  Buffer[80];  // Used for AsciiName param of ParseAcpi
+  IN UINT8   *Ptr,
+  IN UINT16  Length
+  )
+{
+  UINT32  Offset;
+  UINT32  Index;
+  CHAR8   Buffer[80]; // Used for AsciiName param of ParseAcpi
 
   Offset = ParseAcpi (
-            TRUE,
-            2,
-            "ITS Node",
-            Ptr,
-            Length,
-            PARSER_PARAMS (IortNodeItsParser)
-            );
+             TRUE,
+             2,
+             "ITS Node",
+             Ptr,
+             Length,
+             PARSER_PARAMS (IortNodeItsParser)
+             );
 
   // Check if the values used to control the parsing logic have been
@@ -463 +547 @@
 
   while ((Index < *ItsCount) &&
-         (Offset < Length)) {
+         (Offset < Length))
+  {
     AsciiSPrint (
       Buffer,
@@ -482 +567 @@
 
   // Note: ITS does not have the ID Mappings Array
-
 }
 
@@ -497 +581 @@
 VOID
 DumpIortNodeNamedComponent (
-  IN UINT8* Ptr,
-  IN UINT16 Length,
-  IN UINT32 MappingCount,
-  IN UINT32 MappingOffset
-  )
-{
-  UINT32 Offset;
+  IN UINT8   *Ptr,
+  IN UINT16  Length,
+  IN UINT32  MappingCount,
+  IN UINT32  MappingOffset
+  )
+{
+  UINT32  Offset;
 
   Offset = ParseAcpi (
@@ -518 +602 @@
 
   while ((*(Ptr + Offset) != 0) &&
-         (Offset < Length)) {
+         (Offset < Length))
+  {
     Print (L"%c", *(Ptr + Offset));
     Offset++;
   }
+
   Print (L"\n");
 
@@ -543 +629 @@
 VOID
 DumpIortNodeRootComplex (
-  IN UINT8* Ptr,
-  IN UINT16 Length,
-  IN UINT32 MappingCount,
-  IN UINT32 MappingOffset
+  IN UINT8   *Ptr,
+  IN UINT16  Length,
+  IN UINT32  MappingCount,
+  IN UINT32  MappingOffset
   )
 {
@@ -577 +663 @@
 VOID
 DumpIortNodePmcg (
-  IN UINT8* Ptr,
-  IN UINT16 Length,
-  IN UINT32 MappingCount,
-  IN UINT32 MappingOffset
-)
+  IN UINT8   *Ptr,
+  IN UINT16  Length,
+  IN UINT32  MappingCount,
+  IN UINT32  MappingOffset
+  )
 {
   ParseAcpi (
@@ -600 +686 @@
 
 /**
+  This function parses the IORT RMR Node Memory Range Descriptor array.
+
+  @param [in] Ptr         Pointer to the start of the Memory Range Descriptor
+                          array.
+  @param [in] Length      Length of the buffer.
+  @param [in] DescCount   Memory Range Descriptor count.
+**/
+STATIC
+VOID
+DumpIortNodeRmrMemRangeDesc (
+  IN UINT8   *Ptr,
+  IN UINT32  Length,
+  IN UINT32  DescCount
+  )
+{
+  UINT32  Index;
+  UINT32  Offset;
+  CHAR8   Buffer[40]; // Used for AsciiName param of ParseAcpi
+
+  Index  = 0;
+  Offset = 0;
+
+  while ((Index < DescCount) &&
+         (Offset < Length))
+  {
+    AsciiSPrint (
+      Buffer,
+      sizeof (Buffer),
+      "Mem range Descriptor [%d]",
+      Index
+      );
+    Offset += ParseAcpi (
+                TRUE,
+                4,
+                Buffer,
+                Ptr + Offset,
+                Length - Offset,
+                PARSER_PARAMS (IortNodeRmrMemRangeDescParser)
+                );
+    Index++;
+  }
+}
+
+/**
+  This function parses the IORT RMR node.
+
+  @param [in] Ptr            Pointer to the start of the buffer.
+  @param [in] Length         Length of the buffer.
+  @param [in] MappingCount   The ID Mapping count.
+  @param [in] MappingOffset  The offset of the ID Mapping array
+                             from the start of the IORT table.
+**/
+STATIC
+VOID
+DumpIortNodeRmr (
+  IN UINT8   *Ptr,
+  IN UINT16  Length,
+  IN UINT32  MappingCount,
+  IN UINT32  MappingOffset
+  )
+{
+  ParseAcpi (
+    TRUE,
+    2,
+    "RMR Node",
+    Ptr,
+    Length,
+    PARSER_PARAMS (IortNodeRmrParser)
+    );
+
+  if (*IortNodeRevision == EFI_ACPI_IORT_RMR_NODE_REVISION_02) {
+    IncrementErrorCount ();
+    Print (
+      L"ERROR: RMR node Rev 2 (defined in IORT Rev E.c) must not be used."
+      L" IORT tabe Revision E.c is deprecated and must not be used.\n"
+      );
+  }
+
+  DumpIortNodeIdMappings (
+    Ptr + MappingOffset,
+    Length - MappingOffset,
+    MappingCount
+    );
+
+  DumpIortNodeRmrMemRangeDesc (
+    Ptr + (*RmrMemDescOffset),
+    Length - (*RmrMemDescOffset),
+    *RmrMemDescCount
+    );
+}
+
+/**
   This function parses the ACPI IORT table.
-  When trace is enabled this function parses the IORT table and traces the ACPI fields.
+  When trace is enabled this function parses the IORT table and traces the ACPI
+  fields.
 
   This function also parses the following nodes:
@@ -610 +789 @@
     - SMMUv3
     - PMCG
+    - RMR
 
   This function also performs validation of the ACPI table fields.
@@ -621 +801 @@
 EFIAPI
 ParseAcpiIort (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
-  )
-{
-  UINT32 Offset;
-  UINT32 Index;
-  UINT8* NodePtr;
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
+  )
+{
+  UINT32  Offset;
+  UINT32  Index;
+  UINT8   *NodePtr;
 
   if (!Trace) {
+    return;
+  }
+
+  if ((AcpiTableRevision > EFI_ACPI_IO_REMAPPING_TABLE_REVISION_00) &&
+      (AcpiTableRevision < EFI_ACPI_IO_REMAPPING_TABLE_REVISION_05))
+  {
+    Print (
+      L"ERROR: Parsing not supported for IORT tabe Revision E, E.<a,b,c>.\n"
+      );
+    if (AcpiTableRevision == EFI_ACPI_IO_REMAPPING_TABLE_REVISION_04) {
+      IncrementErrorCount ();
+      Print (
+        L"ERROR: IORT tabe Revision E.c is deprecated and must not be used.\n"
+        );
+    }
+
     return;
   }
@@ -647 +843 @@
   // successfully read.
   if ((IortNodeCount == NULL) ||
-      (IortNodeOffset == NULL)) {
+      (IortNodeOffset == NULL))
+  {
     IncrementErrorCount ();
     Print (
@@ -656 +853 @@
   }
 
-  Offset = *IortNodeOffset;
+  Offset  = *IortNodeOffset;
   NodePtr = Ptr + Offset;
-  Index = 0;
+  Index   = 0;
 
   // Parse the specified number of IORT nodes or the IORT table buffer length.
   // Whichever is minimum.
   while ((Index++ < *IortNodeCount) &&
-         (Offset < AcpiTableLength)) {
+         (Offset < AcpiTableLength))
+  {
     // Parse the IORT Node Header
     ParseAcpi (
@@ -679 +877 @@
         (IortNodeLength == NULL)      ||
         (IortIdMappingCount == NULL)  ||
-        (IortIdMappingOffset == NULL)) {
+        (IortIdMappingOffset == NULL))
+    {
       IncrementErrorCount ();
       Print (
         L"ERROR: Insufficient remaining table buffer length to read the " \
-          L"IORT node header. Length = %d.\n",
+        L"IORT node header. Length = %d.\n",
         AcpiTableLength - Offset
         );
@@ -691 +890 @@
     // Validate IORT Node length
     if ((*IortNodeLength == 0) ||
-        ((Offset + (*IortNodeLength)) > AcpiTableLength)) {
+        ((Offset + (*IortNodeLength)) > AcpiTableLength))
+    {
       IncrementErrorCount ();
       Print (
         L"ERROR: Invalid IORT Node length. " \
-          L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
+        L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
         *IortNodeLength,
         Offset,
@@ -751 +951 @@
           *IortIdMappingCount,
           *IortIdMappingOffset
-        );
+          );
         break;
-
+      case EFI_ACPI_IORT_TYPE_RMR:
+        DumpIortNodeRmr (
+          NodePtr,
+          *IortNodeLength,
+          *IortIdMappingCount,
+          *IortIdMappingOffset
+          );
+        break;
       default:
         IncrementErrorCount ();
@@ -760 +967 @@
 
     NodePtr += (*IortNodeLength);
-    Offset += (*IortNodeLength);
+    Offset  += (*IortNodeLength);
   } // while
 }

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c

@@ -3 +3 @@
 
   Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.
+  Copyright (c) 2022, AMD Incorporated. All rights reserved.
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -20 +21 @@
 
 // Local Variables
-STATIC CONST UINT8* MadtInterruptControllerType;
-STATIC CONST UINT8* MadtInterruptControllerLength;
-STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
+STATIC CONST UINT8                   *MadtInterruptControllerType;
+STATIC CONST UINT8                   *MadtInterruptControllerLength;
+STATIC ACPI_DESCRIPTION_HEADER_INFO  AcpiHdrInfo;
 
 /**
@@ -35 +36 @@
 EFIAPI
 ValidateGICDSystemVectorBase (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-)
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
 {
-  if (*(UINT32*)Ptr != 0) {
+  if (*(UINT32 *)Ptr != 0) {
     IncrementErrorCount ();
     Print (
       L"\nERROR: System Vector Base must be zero."
-    );
+      );
   }
 }
@@ -58 +59 @@
 EFIAPI
 ValidateSpeOverflowInterrupt (
-  IN UINT8* Ptr,
-  IN VOID*  Context
+  IN UINT8  *Ptr,
+  IN VOID   *Context
   )
 {
-  UINT16 SpeOverflowInterrupt;
-
-  SpeOverflowInterrupt = *(UINT16*)Ptr;
+  UINT16  SpeOverflowInterrupt;
+
+  SpeOverflowInterrupt = *(UINT16 *)Ptr;
 
   // SPE not supported by this processor
@@ -74 +75 @@
       ((SpeOverflowInterrupt > ARM_PPI_ID_MAX) &&
        (SpeOverflowInterrupt < ARM_PPI_ID_EXTENDED_MIN)) ||
-      (SpeOverflowInterrupt > ARM_PPI_ID_EXTENDED_MAX)) {
+      (SpeOverflowInterrupt > ARM_PPI_ID_EXTENDED_MAX))
+  {
     IncrementErrorCount ();
     Print (
       L"\nERROR: SPE Overflow Interrupt ID of %d is not in the allowed PPI ID "
-        L"ranges of %d-%d or %d-%d (for GICv3.1 or later).",
+      L"ranges of %d-%d or %d-%d (for GICv3.1 or later).",
       SpeOverflowInterrupt,
       ARM_PPI_ID_MIN,
@@ -84 +86 @@
       ARM_PPI_ID_EXTENDED_MIN,
       ARM_PPI_ID_EXTENDED_MAX
-    );
+      );
   } else if (SpeOverflowInterrupt != ARM_PPI_ID_PMBIRQ) {
-    IncrementWarningCount();
+    IncrementWarningCount ();
     Print (
       L"\nWARNING: SPE Overflow Interrupt ID of %d is not compliant with SBSA "
-        L"Level 3 PPI ID assignment: %d.",
+      L"Level 3 PPI ID assignment: %d.",
       SpeOverflowInterrupt,
       ARM_PPI_ID_PMBIRQ
-    );
+      );
   }
 }
@@ -99 +101 @@
   An ACPI_PARSER array describing the GICC Interrupt Controller Structure.
 **/
-STATIC CONST ACPI_PARSER GicCParser[] = {
-  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL},
-  {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"CPU Interface Number", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"ACPI Processor UID", 4, 8, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Flags", 4, 12, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Parking Protocol Version", 4, 16, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"Performance Interrupt GSIV", 4, 20, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Parked Address", 8, 24, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Physical Base Address", 8, 32, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"GICV", 8, 40, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"GICH", 8, 48, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"VGIC Maintenance interrupt", 4, 56, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"GICR Base Address", 8, 60, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"MPIDR", 8, 68, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Processor Power Efficiency Class", 1, 76, L"0x%x", NULL, NULL, NULL,
-   NULL},
-  {L"Reserved", 1, 77, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"SPE overflow Interrupt", 2, 78, L"0x%x", NULL, NULL,
-    ValidateSpeOverflowInterrupt, NULL}
+STATIC CONST ACPI_PARSER  GicCParser[] = {
+  { L"Type",                             1, 0,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Length",                           1, 1,  L"%d",    NULL, NULL, NULL, NULL },
+  { L"Reserved",                         2, 2,  L"0x%x",  NULL, NULL, NULL, NULL },
+
+  { L"CPU Interface Number",             4, 4,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"ACPI Processor UID",               4, 8,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Flags",                            4, 12, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Parking Protocol Version",         4, 16, L"0x%x",  NULL, NULL, NULL, NULL },
+
+  { L"Performance Interrupt GSIV",       4, 20, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Parked Address",                   8, 24, L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"Physical Base Address",            8, 32, L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"GICV",                             8, 40, L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"GICH",                             8, 48, L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"VGIC Maintenance interrupt",       4, 56, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"GICR Base Address",                8, 60, L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"MPIDR",                            8, 68, L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"Processor Power Efficiency Class", 1, 76, L"0x%x",  NULL, NULL, NULL,
+    NULL },
+  { L"Reserved",                         1, 77, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"SPE overflow Interrupt",           2, 78, L"0x%x",  NULL, NULL,
+    ValidateSpeOverflowInterrupt, NULL }
 };
 
@@ -127 +129 @@
   An ACPI_PARSER array describing the GICD Interrupt Controller Structure.
 **/
-STATIC CONST ACPI_PARSER GicDParser[] = {
-  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL},
-  {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"GIC ID", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Physical Base Address", 8, 8, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"System Vector Base", 4, 16, L"0x%x", NULL, NULL,
-    ValidateGICDSystemVectorBase, NULL},
-  {L"GIC Version", 1, 20, L"%d", NULL, NULL, NULL, NULL},
-  {L"Reserved", 3, 21, L"%x %x %x", Dump3Chars, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  GicDParser[] = {
+  { L"Type",                  1, 0,  L"0x%x",     NULL,       NULL, NULL, NULL },
+  { L"Length",                1, 1,  L"%d",       NULL,       NULL, NULL, NULL },
+  { L"Reserved",              2, 2,  L"0x%x",     NULL,       NULL, NULL, NULL },
+
+  { L"GIC ID",                4, 4,  L"0x%x",     NULL,       NULL, NULL, NULL },
+  { L"Physical Base Address", 8, 8,  L"0x%lx",    NULL,       NULL, NULL, NULL },
+  { L"System Vector Base",    4, 16, L"0x%x",     NULL,       NULL,
+    ValidateGICDSystemVectorBase, NULL },
+  { L"GIC Version",           1, 20, L"%d",       NULL,       NULL, NULL, NULL },
+  { L"Reserved",              3, 21, L"%x %x %x", Dump3Chars, NULL, NULL, NULL }
 };
 
@@ -143 +145 @@
   An ACPI_PARSER array describing the MSI Frame Interrupt Controller Structure.
 **/
-STATIC CONST ACPI_PARSER GicMSIFrameParser[] = {
-  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL},
-  {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"MSI Frame ID", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Physical Base Address", 8, 8, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Flags", 4, 16, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"SPI Count", 2, 20, L"%d", NULL, NULL, NULL, NULL},
-  {L"SPI Base", 2, 22, L"0x%x", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  GicMSIFrameParser[] = {
+  { L"Type",                  1, 0,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Length",                1, 1,  L"%d",    NULL, NULL, NULL, NULL },
+  { L"Reserved",              2, 2,  L"0x%x",  NULL, NULL, NULL, NULL },
+
+  { L"MSI Frame ID",          4, 4,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Physical Base Address", 8, 8,  L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"Flags",                 4, 16, L"0x%x",  NULL, NULL, NULL, NULL },
+
+  { L"SPI Count",             2, 20, L"%d",    NULL, NULL, NULL, NULL },
+  { L"SPI Base",              2, 22, L"0x%x",  NULL, NULL, NULL, NULL }
 };
 
@@ -159 +161 @@
   An ACPI_PARSER array describing the GICR Interrupt Controller Structure.
 **/
-STATIC CONST ACPI_PARSER GicRParser[] = {
-  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL},
-  {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"Discovery Range Base Address", 8, 4, L"0x%lx", NULL, NULL, NULL,
-   NULL},
-  {L"Discovery Range Length", 4, 12, L"0x%x", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  GicRParser[] = {
+  { L"Type",                         1, 0,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Length",                       1, 1,  L"%d",    NULL, NULL, NULL, NULL },
+  { L"Reserved",                     2, 2,  L"0x%x",  NULL, NULL, NULL, NULL },
+
+  { L"Discovery Range Base Address", 8, 4,  L"0x%lx", NULL, NULL, NULL,
+    NULL },
+  { L"Discovery Range Length",       4, 12, L"0x%x",  NULL, NULL, NULL, NULL }
 };
 
@@ -172 +174 @@
   An ACPI_PARSER array describing the GIC ITS Interrupt Controller Structure.
 **/
-STATIC CONST ACPI_PARSER GicITSParser[] = {
-  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL},
-  {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"GIC ITS ID", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Physical Base Address", 8, 8, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Reserved", 4, 16, L"0x%x", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  GicITSParser[] = {
+  { L"Type",                  1, 0,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Length",                1, 1,  L"%d",    NULL, NULL, NULL, NULL },
+  { L"Reserved",              2, 2,  L"0x%x",  NULL, NULL, NULL, NULL },
+
+  { L"GIC ITS ID",            4, 4,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Physical Base Address", 8, 8,  L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"Reserved",              4, 16, L"0x%x",  NULL, NULL, NULL, NULL }
+};
+
+/**
+  An ACPI_PARSER array describing the IO APIC Structure.
+**/
+STATIC CONST ACPI_PARSER  IoApic[] = {
+  { L"Type",                         1, 0, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Length",                       1, 1, L"%d",   NULL, NULL, NULL, NULL },
+  { L"I/O APIC ID",                  1, 2, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Reserved",                     1, 3, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"I/O APIC Address",             4, 4, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Global System Interrupt Base", 4, 8, L"0x%x", NULL, NULL, NULL, NULL }
+};
+
+/**
+  An ACPI_PARSER array describing the Interrupt Source Override Structure.
+**/
+STATIC CONST ACPI_PARSER  InterruptSourceOverride[] = {
+  { L"Type",                    1, 0, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Length",                  1, 1, L"%d",   NULL, NULL, NULL, NULL },
+  { L"Bus",                     1, 2, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Source",                  1, 3, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Global System Interrupt", 4, 4, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Flags",                   2, 8, L"0x%x", NULL, NULL, NULL, NULL }
+};
+
+STATIC CONST ACPI_PARSER  LocalApicFlags[] = {
+  { L"Enabled",        1,  0, L"%d", NULL, NULL, NULL, NULL },
+  { L"Online Capable", 1,  1, L"%d", NULL, NULL, NULL, NULL },
+  { L"Reserved",       30, 2, L"%d", NULL, NULL, NULL, NULL }
+};
+
+/**
+  This function traces Bit Flags fields.
+  If no format string is specified the Format must be NULL.
+
+  @param [in] Format  Optional format string for tracing the data.
+  @param [in] Ptr     Pointer to the start of the buffer.
+**/
+VOID
+EFIAPI
+DumpLocalApicBitFlags (
+  IN CONST CHAR16  *Format OPTIONAL,
+  IN UINT8         *Ptr
+  )
+{
+  if (Format != NULL) {
+    Print (Format, *(UINT32 *)Ptr);
+    return;
+  }
+
+  Print (L"0x%X\n", *(UINT32 *)Ptr);
+  ParseAcpiBitFields (
+    TRUE,
+    2,
+    NULL,
+    Ptr,
+    4,
+    PARSER_PARAMS (LocalApicFlags)
+    );
+}
+
+/**
+   An ACPI_PARSER array describing the Processor Local APIC Structure.
+ **/
+STATIC CONST ACPI_PARSER  ProcessorLocalApic[] = {
+  { L"Type",               1, 0, L"0x%x", NULL,                  NULL, NULL, NULL },
+  { L"Length",             1, 1, L"%d",   NULL,                  NULL, NULL, NULL },
+
+  { L"ACPI Processor UID", 1, 2, L"0x%x", NULL,                  NULL, NULL, NULL },
+  { L"APIC ID",            1, 3, L"0x%x", NULL,                  NULL, NULL, NULL },
+  { L"Flags",              4, 4, NULL,    DumpLocalApicBitFlags, NULL, NULL, NULL }
+};
+
+/**
+  An ACPI_PARSER array describing the Processor Local x2APIC Structure.
+**/
+STATIC CONST ACPI_PARSER  ProcessorLocalX2Apic[] = {
+  { L"Type",               1, 0,  L"0x%x", NULL,                  NULL, NULL, NULL },
+  { L"Length",             1, 1,  L"%d",   NULL,                  NULL, NULL, NULL },
+  { L"Reserved",           2, 2,  L"0x%x", NULL,                  NULL, NULL, NULL },
+
+  { L"X2APIC ID",          4, 4,  L"0x%x", NULL,                  NULL, NULL, NULL },
+  { L"Flags",              4, 8,  NULL,    DumpLocalApicBitFlags, NULL, NULL, NULL },
+  { L"ACPI Processor UID", 4, 12, L"0x%x", NULL,                  NULL, NULL, NULL }
+};
+
+/**
+  An ACPI_PARSER array describing the Local x2APIC NMI Structure.
+**/
+STATIC CONST ACPI_PARSER  LocalX2ApicNmi[] = {
+  { L"Type",               1, 0, L"0x%x",     NULL,       NULL, NULL, NULL },
+  { L"Length",             1, 1, L"%d",       NULL,       NULL, NULL, NULL },
+  { L"Flags",              2, 2, L"0x%x",     NULL,       NULL, NULL, NULL },
+
+  { L"ACPI Processor UID", 4, 4, L"0x%x",     NULL,       NULL, NULL, NULL },
+  { L"Local x2APIC LINT#", 1, 8, L"0x%x",     NULL,       NULL, NULL, NULL },
+  { L"Reserved",           3, 9, L"0x%x%x%x", Dump3Chars, NULL, NULL, NULL }
 };
 
@@ -185 +285 @@
   An ACPI_PARSER array describing the ACPI MADT Table.
 **/
-STATIC CONST ACPI_PARSER MadtParser[] = {
+STATIC CONST ACPI_PARSER  MadtParser[] = {
   PARSE_ACPI_HEADER (&AcpiHdrInfo),
-  {L"Local Interrupt Controller Address", 4, 36, L"0x%x", NULL, NULL, NULL,
-   NULL},
-  {L"Flags", 4, 40, L"0x%x", NULL, NULL, NULL, NULL}
+  { L"Local Interrupt Controller Address",4,         36, L"0x%x", NULL, NULL, NULL,
+    NULL },
+  { L"Flags",                      4,         40, L"0x%x", NULL, NULL, NULL,NULL}
 };
 
@@ -195 +295 @@
   An ACPI_PARSER array describing the MADT Interrupt Controller Structure Header Structure.
 **/
-STATIC CONST ACPI_PARSER MadtInterruptControllerHeaderParser[] = {
-  {NULL, 1, 0, NULL, NULL, (VOID**)&MadtInterruptControllerType, NULL, NULL},
-  {L"Length", 1, 1, NULL, NULL, (VOID**)&MadtInterruptControllerLength, NULL,
-   NULL},
-  {L"Reserved", 2, 2, NULL, NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  MadtInterruptControllerHeaderParser[] = {
+  { NULL,        1, 0, NULL, NULL, (VOID **)&MadtInterruptControllerType,   NULL, NULL },
+  { L"Length",   1, 1, NULL, NULL, (VOID **)&MadtInterruptControllerLength, NULL,
+    NULL },
+  { L"Reserved", 2, 2, NULL, NULL, NULL,                                    NULL, NULL }
 };
 
@@ -225 +325 @@
 EFIAPI
 ParseAcpiMadt (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
   )
 {
-  UINT32 Offset;
-  UINT8* InterruptContollerPtr;
-  UINT32 GICDCount;
+  UINT32  Offset;
+  UINT8   *InterruptContollerPtr;
+  UINT32  GICDCount;
 
   GICDCount = 0;
@@ -265 +365 @@
     // successfully read.
     if ((MadtInterruptControllerType == NULL) ||
-        (MadtInterruptControllerLength == NULL)) {
+        (MadtInterruptControllerLength == NULL))
+    {
       IncrementErrorCount ();
       Print (
         L"ERROR: Insufficient remaining table buffer length to read the " \
-          L"Interrupt Controller Structure header. Length = %d.\n",
+        L"Interrupt Controller Structure header. Length = %d.\n",
         AcpiTableLength - Offset
         );
@@ -277 +378 @@
     // Validate Interrupt Controller Structure length
     if ((*MadtInterruptControllerLength == 0) ||
-        ((Offset + (*MadtInterruptControllerLength)) > AcpiTableLength)) {
+        ((Offset + (*MadtInterruptControllerLength)) > AcpiTableLength))
+    {
       IncrementErrorCount ();
       Print (
         L"ERROR: Invalid Interrupt Controller Structure length. " \
-          L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
+        L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
         *MadtInterruptControllerLength,
         Offset,
@@ -290 +392 @@
 
     switch (*MadtInterruptControllerType) {
-      case EFI_ACPI_6_3_GIC: {
+      case EFI_ACPI_6_3_GIC:
+      {
         ParseAcpi (
           TRUE,
@@ -302 +405 @@
       }
 
-      case EFI_ACPI_6_3_GICD: {
+      case EFI_ACPI_6_3_GICD:
+      {
         if (++GICDCount > 1) {
           IncrementErrorCount ();
           Print (
             L"ERROR: Only one GICD must be present,"
-              L" GICDCount = %d\n",
+            L" GICDCount = %d\n",
             GICDCount
             );
         }
+
         ParseAcpi (
           TRUE,
@@ -322 +427 @@
       }
 
-      case EFI_ACPI_6_3_GIC_MSI_FRAME: {
+      case EFI_ACPI_6_3_GIC_MSI_FRAME:
+      {
         ParseAcpi (
           TRUE,
@@ -334 +440 @@
       }
 
-      case EFI_ACPI_6_3_GICR: {
+      case EFI_ACPI_6_3_GICR:
+      {
         ParseAcpi (
           TRUE,
@@ -346 +453 @@
       }
 
-      case EFI_ACPI_6_3_GIC_ITS: {
+      case EFI_ACPI_6_3_GIC_ITS:
+      {
         ParseAcpi (
           TRUE,
@@ -358 +466 @@
       }
 
-      default: {
+      case EFI_ACPI_6_3_IO_APIC:
+      {
+        ParseAcpi (
+          TRUE,
+          2,
+          "IO APIC",
+          InterruptContollerPtr,
+          *MadtInterruptControllerLength,
+          PARSER_PARAMS (IoApic)
+          );
+        break;
+      }
+
+      case EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE:
+      {
+        ParseAcpi (
+          TRUE,
+          2,
+          "INTERRUPT SOURCE OVERRIDE",
+          InterruptContollerPtr,
+          *MadtInterruptControllerLength,
+          PARSER_PARAMS (InterruptSourceOverride)
+          );
+        break;
+      }
+      case EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC:
+      {
+        ParseAcpi (
+          TRUE,
+          2,
+          "PROCESSOR LOCAL APIC",
+          InterruptContollerPtr,
+          *MadtInterruptControllerLength,
+          PARSER_PARAMS (ProcessorLocalApic)
+          );
+        break;
+      }
+      case EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC:
+      {
+        ParseAcpi (
+          TRUE,
+          2,
+          "PROCESSOR LOCAL X2APIC",
+          InterruptContollerPtr,
+          *MadtInterruptControllerLength,
+          PARSER_PARAMS (ProcessorLocalX2Apic)
+          );
+        break;
+      }
+
+      case EFI_ACPI_6_3_LOCAL_X2APIC_NMI:
+      {
+        ParseAcpi (
+          TRUE,
+          2,
+          "LOCAL x2APIC NMI",
+          InterruptContollerPtr,
+          *MadtInterruptControllerLength,
+          PARSER_PARAMS (LocalX2ApicNmi)
+          );
+        break;
+      }
+
+      default:
+      {
         IncrementErrorCount ();
         Print (
           L"ERROR: Unknown Interrupt Controller Structure,"
-            L" Type = %d, Length = %d\n",
+          L" Type = %d, Length = %d\n",
           *MadtInterruptControllerType,
           *MadtInterruptControllerLength
@@ -370 +542 @@
 
     InterruptContollerPtr += *MadtInterruptControllerLength;
-    Offset += *MadtInterruptControllerLength;
+    Offset                += *MadtInterruptControllerLength;
   } // while
 }

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.h

@@ -17 +17 @@
 /// Level 3 base server system Private Peripheral Inerrupt (PPI) ID assignments
 ///
-#define ARM_PPI_ID_OVERFLOW_INTERRUPT_FROM_CNTP       30
-#define ARM_PPI_ID_OVERFLOW_INTERRUPT_FROM_CNTPS      29
-#define ARM_PPI_ID_OVERFLOW_INTERRUPT_FROM_CNTHV      28
-#define ARM_PPI_ID_OVERFLOW_INTERRUPT_FROM_CNTV       27
-#define ARM_PPI_ID_OVERFLOW_INTERRUPT_FROM_CNTHP      26
-#define ARM_PPI_ID_GIC_MAINTENANCE_INTERRUPT          25
-#define ARM_PPI_ID_CTIIRQ                             24
-#define ARM_PPI_ID_PERFORMANCE_MONITORS_INTERRUPT     23
-#define ARM_PPI_ID_COMMIRQ                            22
-#define ARM_PPI_ID_PMBIRQ                             21
-#define ARM_PPI_ID_CNTHPS                             20
-#define ARM_PPI_ID_CNTHVS                             19
+#define ARM_PPI_ID_OVERFLOW_INTERRUPT_FROM_CNTP    30
+#define ARM_PPI_ID_OVERFLOW_INTERRUPT_FROM_CNTPS   29
+#define ARM_PPI_ID_OVERFLOW_INTERRUPT_FROM_CNTHV   28
+#define ARM_PPI_ID_OVERFLOW_INTERRUPT_FROM_CNTV    27
+#define ARM_PPI_ID_OVERFLOW_INTERRUPT_FROM_CNTHP   26
+#define ARM_PPI_ID_GIC_MAINTENANCE_INTERRUPT       25
+#define ARM_PPI_ID_CTIIRQ                          24
+#define ARM_PPI_ID_PERFORMANCE_MONITORS_INTERRUPT  23
+#define ARM_PPI_ID_COMMIRQ                         22
+#define ARM_PPI_ID_PMBIRQ                          21
+#define ARM_PPI_ID_CNTHPS                          20
+#define ARM_PPI_ID_CNTHVS                          19
 
 ///
 /// PPI ID allowed ranges
 ///
-#define ARM_PPI_ID_MAX              31
-#define ARM_PPI_ID_MIN              16
-#define ARM_PPI_ID_EXTENDED_MAX     1119
-#define ARM_PPI_ID_EXTENDED_MIN     1056
+#define ARM_PPI_ID_MAX           31
+#define ARM_PPI_ID_MIN           16
+#define ARM_PPI_ID_EXTENDED_MAX  1119
+#define ARM_PPI_ID_EXTENDED_MIN  1056
 
 #endif // MADT_PARSER_H_

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Mcfg/McfgParser.c

@@ -15 +15 @@
 
 // Local variables
-STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
+STATIC ACPI_DESCRIPTION_HEADER_INFO  AcpiHdrInfo;
 
 /**
   An ACPI_PARSER array describing the ACPI MCFG Table.
 **/
-STATIC CONST ACPI_PARSER McfgParser[] = {
+STATIC CONST ACPI_PARSER  McfgParser[] = {
   PARSE_ACPI_HEADER (&AcpiHdrInfo),
-  {L"Reserved", 8, 36, L"0x%lx", NULL, NULL, NULL, NULL},
+  { L"Reserved",                   8,36, L"0x%lx", NULL, NULL, NULL, NULL },
 };
 
@@ -28 +28 @@
   An ACPI_PARSER array describing the PCI configuration Space Base Address structure.
 **/
-STATIC CONST ACPI_PARSER PciCfgSpaceBaseAddrParser[] = {
-  {L"Base Address", 8, 0, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"PCI Segment Group No.", 2, 8, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Start Bus No.", 1, 10, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"End Bus No.", 1, 11, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 4, 12, L"0x%x", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  PciCfgSpaceBaseAddrParser[] = {
+  { L"Base Address",          8, 0,  L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"PCI Segment Group No.", 2, 8,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Start Bus No.",         1, 10, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"End Bus No.",           1, 11, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Reserved",              4, 12, L"0x%x",  NULL, NULL, NULL, NULL }
 };
 
@@ -51 +51 @@
 EFIAPI
 ParseAcpiMcfg (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
   )
 {
-  UINT32 Offset;
-  UINT32 PciCfgOffset;
-  UINT8* PciCfgSpacePtr;
+  UINT32  Offset;
+  UINT32  PciCfgOffset;
+  UINT8   *PciCfgSpacePtr;
 
   if (!Trace) {
@@ -86 +86 @@
                      );
     PciCfgSpacePtr += PciCfgOffset;
-    Offset += PciCfgOffset;
+    Offset         += PciCfgOffset;
   }
 }

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.c

@@ -2 +2 @@
   PCCT table parser
 
-  Copyright (c) 2020, Arm Limited.
+  Copyright (c) 2021, Arm Limited.
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @par Reference(s):
-    - ACPI 6.3 Specification - January 2019
+    - ACPI 6.4 Specification - January 2021
 **/
 
@@ -18 +18 @@
 
 // Local variables
-STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
-
-STATIC UINT32* PccGlobalFlags;
-STATIC UINT8*  PccSubspaceLength;
-STATIC UINT8*  PccSubspaceType;
-STATIC UINT8*  ExtendedPccSubspaceInterruptFlags;
+STATIC ACPI_DESCRIPTION_HEADER_INFO  AcpiHdrInfo;
+
+STATIC UINT32  *PccGlobalFlags;
+STATIC UINT8   *PccSubspaceLength;
+STATIC UINT8   *PccSubspaceType;
+STATIC UINT8   *ExtendedPccSubspaceInterruptFlags;
 
 /**
@@ -36 +36 @@
 EFIAPI
 ValidateRangeLength4 (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-  )
-{
-  if (*(UINT32*)Ptr < MIN_EXT_PCC_SUBSPACE_MEM_RANGE_LEN) {
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  if (*(UINT32 *)Ptr < MIN_EXT_PCC_SUBSPACE_MEM_RANGE_LEN) {
     IncrementErrorCount ();
     Print (
       L"\nError: Shared memory range length is too short.\n"
       L"Length is %u when it should be greater than or equal to %u",
-      *(UINT32*)Ptr,
+      *(UINT32 *)Ptr,
       MIN_EXT_PCC_SUBSPACE_MEM_RANGE_LEN
       );
@@ -62 +62 @@
 EFIAPI
 ValidateRangeLength8 (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-  )
-{
-  if (*(UINT64*)Ptr <= MIN_MEMORY_RANGE_LENGTH) {
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  if (*(UINT64 *)Ptr <= MIN_MEMORY_RANGE_LENGTH) {
     IncrementErrorCount ();
     Print (
       L"\nError: Shared memory range length is too short.\n"
       L"Length is %u when it should be greater than %u",
-      *(UINT64*)Ptr,
+      *(UINT64 *)Ptr,
       MIN_MEMORY_RANGE_LENGTH
       );
@@ -78 +78 @@
 
 /**
-  This function validates address space for type 0 structure.
-
-  @param [in] Ptr     Pointer to the start of the field data.
-  @param [in] Context Pointer to context specific information e.g. this
-                      could be a pointer to the ACPI table header.
-**/
-STATIC
-VOID
-EFIAPI
-ValidatePccType0Gas (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-  )
-{
-  switch (*(UINT8*)Ptr) {
-#if !(defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64))
-    case EFI_ACPI_6_3_SYSTEM_IO:
-#endif //if not (defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64))
-    case EFI_ACPI_6_3_SYSTEM_MEMORY:
+  This function validates address space for Memory/IO GAS.
+
+  @param [in] Ptr     Pointer to the start of the field data.
+  @param [in] Context Pointer to context specific information e.g. this
+                      could be a pointer to the ACPI table header.
+**/
+STATIC
+VOID
+EFIAPI
+ValidatePccMemoryIoGas (
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  switch (*(UINT8 *)Ptr) {
+ #if !(defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64))
+    case EFI_ACPI_6_4_SYSTEM_IO:
+ #endif //if not (defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64))
+    case EFI_ACPI_6_4_SYSTEM_MEMORY:
       return;
     default:
@@ -115 +115 @@
 EFIAPI
 ValidatePccGas (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-  )
-{
-  switch (*(UINT8*)Ptr) {
-#if !(defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64))
-    case EFI_ACPI_6_3_SYSTEM_IO:
-#endif //if not (defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64))
-    case EFI_ACPI_6_3_FUNCTIONAL_FIXED_HARDWARE:
-    case EFI_ACPI_6_3_SYSTEM_MEMORY:
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  switch (*(UINT8 *)Ptr) {
+ #if !(defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64))
+    case EFI_ACPI_6_4_SYSTEM_IO:
+ #endif //if not (defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64))
+    case EFI_ACPI_6_4_FUNCTIONAL_FIXED_HARDWARE:
+    case EFI_ACPI_6_4_SYSTEM_MEMORY:
       return;
     default:
@@ -143 +143 @@
 EFIAPI
 ValidatePccDoorbellGas (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-  )
-{
-  // For slave subspaces this field is optional, if not present the field
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  // For responder subspaces this field is optional, if not present the field
   // should just contain zeros.
-  if (*PccSubspaceType == EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) {
+  if (*PccSubspaceType == EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) {
     if (IsZeroBuffer (
           Ptr,
-          sizeof (EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE)
-          )) {
+          sizeof (EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE)
+          ))
+    {
       return;
     }
@@ -173 +174 @@
 EFIAPI
 ValidatePccIntAckGas (
-  IN UINT8* Ptr,
-  IN VOID*  Context
+  IN UINT8  *Ptr,
+  IN VOID   *Context
   )
 {
@@ -181 +182 @@
   // 12 bytes of the GAS structure indicates the register is not
   // present.
-  if (((*PccGlobalFlags & EFI_ACPI_6_3_PCCT_FLAGS_PLATFORM_INTERRUPT) !=
-       EFI_ACPI_6_3_PCCT_FLAGS_PLATFORM_INTERRUPT) ||
+  if (((*PccGlobalFlags & EFI_ACPI_6_4_PCCT_FLAGS_PLATFORM_INTERRUPT) !=
+       EFI_ACPI_6_4_PCCT_FLAGS_PLATFORM_INTERRUPT) ||
       ((*ExtendedPccSubspaceInterruptFlags &
-       EFI_ACPI_6_3_PCCT_SUBSPACE_PLATFORM_INTERRUPT_FLAGS_MODE) ==
-       EFI_ACPI_6_3_PCCT_SUBSPACE_PLATFORM_INTERRUPT_FLAGS_MODE)) {
+        EFI_ACPI_6_4_PCCT_SUBSPACE_PLATFORM_INTERRUPT_FLAGS_MODE) ==
+       EFI_ACPI_6_4_PCCT_SUBSPACE_PLATFORM_INTERRUPT_FLAGS_MODE))
+  {
     if (IsZeroBuffer (
           Ptr,
-          sizeof (EFI_ACPI_6_3_GENERIC_ADDRESS_STRUCTURE)
-          )) {
+          sizeof (EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE)
+          ))
+    {
       return;
     }
@@ -208 +211 @@
 EFIAPI
 ValidatePccErrStatusGas (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-  )
-{
-  // This field is ignored by the OSPM on slave channels.
-  if (*PccSubspaceType == EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) {
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  // This field is ignored by the OSPM on responder channels.
+  if (*PccSubspaceType == EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) {
     return;
   }
@@ -231 +234 @@
 EFIAPI
 ValidatePlatInterrupt (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-  )
-{
-  // If a slave subspace is present in the PCCT, then the global Platform
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  // If a responder subspace is present in the PCCT, then the global Platform
   // Interrupt flag must be set to 1.
-  if ((*PccSubspaceType == EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) &&
-      ((*PccGlobalFlags & EFI_ACPI_6_3_PCCT_FLAGS_PLATFORM_INTERRUPT) !=
-        EFI_ACPI_6_3_PCCT_FLAGS_PLATFORM_INTERRUPT)) {
+  if ((*PccSubspaceType == EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC) &&
+      ((*PccGlobalFlags & EFI_ACPI_6_4_PCCT_FLAGS_PLATFORM_INTERRUPT) !=
+       EFI_ACPI_6_4_PCCT_FLAGS_PLATFORM_INTERRUPT))
+  {
     IncrementErrorCount ();
     Print (
       L"\nError: Global Platform interrupt flag must be set to 1" \
-        L" if a PCC type 4 structure is present in PCCT."
+      L" if a PCC type 4 structure is present in PCCT."
       );
   }
@@ -251 +255 @@
   An ACPI_PARSER array describing the ACPI PCCT Table.
 */
-STATIC CONST ACPI_PARSER PcctParser[] = {
+STATIC CONST ACPI_PARSER  PcctParser[] = {
   PARSE_ACPI_HEADER (&AcpiHdrInfo),
-  {L"Flags", 4, 36, NULL, NULL, (VOID**)&PccGlobalFlags, NULL, NULL},
-  {L"Reserved", 8, 40, NULL, NULL, NULL, NULL, NULL}
+  { L"Flags",                      4,  36, NULL, NULL, (VOID **)&PccGlobalFlags, NULL, NULL },
+  { L"Reserved",                   8,  40, NULL, NULL, NULL,                     NULL, NULL }
 };
 
@@ -261 +265 @@
   structure header.
 */
-STATIC CONST ACPI_PARSER PccSubspaceHeaderParser[] = {
+STATIC CONST ACPI_PARSER  PccSubspaceHeaderParser[] = {
   PCC_SUBSPACE_HEADER ()
   // ... Type Specific Fields ...
@@ -269 +273 @@
   An ACPI_PARSER array describing the Generic Communications Subspace - Type 0
 */
-STATIC CONST ACPI_PARSER PccSubspaceType0Parser[] = {
+STATIC CONST ACPI_PARSER  PccSubspaceType0Parser[] = {
   PCC_SUBSPACE_HEADER (),
-  {L"Reserved", 6, 2, L"%x %x %x %x %x %x", Dump6Chars, NULL, NULL, NULL},
-  {L"Base Address", 8, 8, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Memory Range Length", 8, 16, L"0x%lx", NULL, NULL, ValidateRangeLength8,
-    NULL},
-  {L"Doorbell Register", 12, 24, NULL, DumpGas, NULL, ValidatePccType0Gas,
-    NULL},
-  {L"Doorbell Preserve", 8, 36, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Doorbell Write", 8, 44, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Nominal Latency", 4, 52, L"%u", NULL, NULL, NULL, NULL},
-  {L"Maximum Periodic Access Rate", 4, 56, L"%u", NULL, NULL, NULL, NULL},
-  {L"Minimum Request Turnaround Time", 2, 60, L"%u", NULL, NULL, NULL, NULL}
+  { L"Reserved",         6,   2,  L"%x %x %x %x %x %x", Dump6Chars, NULL, NULL,                   NULL },
+  { L"Base Address",     8,   8,  L"0x%lx",             NULL,       NULL, NULL,                   NULL },
+  { L"Memory Range Length",8,   16, L"0x%lx",             NULL,       NULL, ValidateRangeLength8,
+    NULL },
+  { L"Doorbell Register",12,  24, NULL,                 DumpGas,    NULL, ValidatePccMemoryIoGas,
+    NULL },
+  { L"Doorbell Preserve",8,   36, L"0x%lx",             NULL,       NULL, NULL,                   NULL },
+  { L"Doorbell Write",   8,   44, L"0x%lx",             NULL,       NULL, NULL,                   NULL },
+  { L"Nominal Latency",  4,   52, L"%u",                NULL,       NULL, NULL,                   NULL },
+  { L"Maximum Periodic Access Rate",4,   56, L"%u",                NULL,       NULL, NULL,                   NULL },
+  { L"Minimum Request Turnaround Time",2,   60, L"%u",                NULL,       NULL, NULL,                   NULL }
 };
 
@@ -288 +292 @@
   - Type 1
 */
-STATIC CONST ACPI_PARSER PccSubspaceType1Parser[] = {
+STATIC CONST ACPI_PARSER  PccSubspaceType1Parser[] = {
   PCC_SUBSPACE_HEADER (),
-  {L"Platform Interrupt", 4, 2, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Platform Interrupt Flags", 1, 6, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 1, 7, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Base Address", 8, 8, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Memory Range Length", 8, 16, L"0x%lx", NULL, NULL, ValidateRangeLength8,
-    NULL},
-  {L"Doorbell Register", 12, 24, NULL, DumpGas, NULL,
-    ValidatePccGas, NULL},
-  {L"Doorbell Preserve", 8, 36, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Doorbell Write", 8, 44, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Nominal Latency", 4, 52, L"%u", NULL, NULL, NULL, NULL},
-  {L"Maximum Periodic Access Rate", 4, 56, L"%u", NULL, NULL, NULL, NULL},
-  {L"Minimum Request Turnaround Time", 2, 60, L"%u", NULL, NULL, NULL, NULL}
+  { L"Platform Interrupt",4,   2,  L"0x%x",  NULL,    NULL, NULL,                 NULL },
+  { L"Platform Interrupt Flags",1,   6,  L"0x%x",  NULL,    NULL, NULL,                 NULL },
+  { L"Reserved",         1,   7,  L"0x%x",  NULL,    NULL, NULL,                 NULL },
+  { L"Base Address",     8,   8,  L"0x%lx", NULL,    NULL, NULL,                 NULL },
+  { L"Memory Range Length",8,   16, L"0x%lx", NULL,    NULL, ValidateRangeLength8,
+    NULL },
+  { L"Doorbell Register",12,  24, NULL,     DumpGas, NULL,
+    ValidatePccGas,      NULL },
+  { L"Doorbell Preserve",8,   36, L"0x%lx", NULL,    NULL, NULL,                 NULL },
+  { L"Doorbell Write",   8,   44, L"0x%lx", NULL,    NULL, NULL,                 NULL },
+  { L"Nominal Latency",  4,   52, L"%u",    NULL,    NULL, NULL,                 NULL },
+  { L"Maximum Periodic Access Rate",4,   56, L"%u",    NULL,    NULL, NULL,                 NULL },
+  { L"Minimum Request Turnaround Time",2,   60, L"%u",    NULL,    NULL, NULL,                 NULL }
 };
 
@@ -309 +313 @@
   - Type 2
 */
-STATIC CONST ACPI_PARSER PccSubspaceType2Parser[] = {
+STATIC CONST ACPI_PARSER  PccSubspaceType2Parser[] = {
   PCC_SUBSPACE_HEADER (),
-  {L"Platform Interrupt", 4, 2, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Platform Interrupt Flags", 1, 6, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 1, 7, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Base Address", 8, 8, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Memory Range Length", 8, 16, L"0x%lx", NULL, NULL, ValidateRangeLength8,
-    NULL},
-  {L"Doorbell Register", 12, 24, NULL, DumpGas, NULL,
-    ValidatePccGas, NULL},
-  {L"Doorbell Preserve", 8, 36, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Doorbell Write", 8, 44, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Nominal Latency", 4, 52, L"%u", NULL, NULL, NULL, NULL},
-  {L"Maximum Periodic Access Rate", 4, 56, L"%u", NULL, NULL, NULL, NULL},
-  {L"Minimum Request Turnaround Time", 2, 60, L"%u", NULL, NULL, NULL, NULL},
-  {L"Platform Interrupt Ack Register", 12, 62, NULL, DumpGas, NULL,
-    ValidatePccGas, NULL},
-  {L"Platform Interrupt Ack Preserve", 8, 74, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Platform Interrupt Ack Write", 8, 82, L"0x%lx", NULL, NULL,
-    NULL, NULL},
+  { L"Platform Interrupt",4,   2,  L"0x%x",  NULL,    NULL, NULL,                 NULL },
+  { L"Platform Interrupt Flags",1,   6,  L"0x%x",  NULL,    NULL, NULL,                 NULL },
+  { L"Reserved",         1,   7,  L"0x%x",  NULL,    NULL, NULL,                 NULL },
+  { L"Base Address",     8,   8,  L"0x%lx", NULL,    NULL, NULL,                 NULL },
+  { L"Memory Range Length",8,   16, L"0x%lx", NULL,    NULL, ValidateRangeLength8,
+    NULL },
+  { L"Doorbell Register",12,  24, NULL,     DumpGas, NULL,
+    ValidatePccGas,      NULL },
+  { L"Doorbell Preserve",8,   36, L"0x%lx", NULL,    NULL, NULL,                 NULL },
+  { L"Doorbell Write",   8,   44, L"0x%lx", NULL,    NULL, NULL,                 NULL },
+  { L"Nominal Latency",  4,   52, L"%u",    NULL,    NULL, NULL,                 NULL },
+  { L"Maximum Periodic Access Rate",4,   56, L"%u",    NULL,    NULL, NULL,                 NULL },
+  { L"Minimum Request Turnaround Time",2,   60, L"%u",    NULL,    NULL, NULL,                 NULL },
+  { L"Platform Interrupt Ack Register",12,  62, NULL,     DumpGas, NULL,
+    ValidatePccGas,      NULL },
+  { L"Platform Interrupt Ack Preserve",8,   74, L"0x%lx", NULL,    NULL, NULL,                 NULL },
+  { L"Platform Interrupt Ack Write",8,   82, L"0x%lx", NULL,    NULL,
+    NULL,                NULL },
 };
 
@@ -334 +338 @@
   An ACPI_PARSER array describing the Extended PCC Subspaces - Type 3/4
 */
-STATIC CONST ACPI_PARSER PccSubspaceType3Parser[] = {
+STATIC CONST ACPI_PARSER  PccSubspaceType3Parser[] = {
   PCC_SUBSPACE_HEADER (),
-  {L"Platform Interrupt", 4, 2, L"0x%x", NULL, NULL,
-    ValidatePlatInterrupt, NULL},
-  {L"Platform Interrupt Flags", 1, 6, L"0x%x", NULL,
-    (VOID**)&ExtendedPccSubspaceInterruptFlags, NULL, NULL},
-  {L"Reserved", 1, 7, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Base Address", 8, 8, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Memory Range Length", 4, 16, L"0x%x", NULL, NULL, ValidateRangeLength4,
-    NULL},
-  {L"Doorbell Register", 12, 20, NULL, DumpGas, NULL,
-    ValidatePccDoorbellGas, NULL},
-  {L"Doorbell Preserve", 8, 32, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Doorbell Write", 8, 40, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Nominal Latency", 4, 48, L"%u", NULL, NULL, NULL, NULL},
-  {L"Maximum Periodic Access Rate", 4, 52, L"%u", NULL, NULL, NULL, NULL},
-  {L"Minimum Request Turnaround Time", 4, 56, L"%u", NULL, NULL, NULL, NULL},
-  {L"Platform Interrupt Ack Register", 12, 60, NULL, DumpGas, NULL,
-    ValidatePccIntAckGas, NULL},
-  {L"Platform Interrupt Ack Preserve", 8, 72, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Platform Interrupt Ack Set", 8, 80, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Reserved", 8, 88, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Cmd Complete Check Reg Addr", 12, 96, NULL, DumpGas, NULL,
-    ValidatePccGas, NULL},
-  {L"Cmd Complete Check Mask", 8, 108, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Cmd Update Reg Addr", 12, 116, NULL, DumpGas, NULL,
-    ValidatePccGas, NULL},
-  {L"Cmd Update Preserve mask", 8, 128, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Cmd Update Set mask", 8, 136, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"Error Status Register", 12, 144, NULL, DumpGas, NULL,
-    ValidatePccErrStatusGas, NULL},
-  {L"Error Status Mask", 8, 156, L"0x%lx", NULL, NULL, NULL, NULL},
+  { L"Platform Interrupt",                      4,     2,   L"0x%x",  NULL,    NULL,
+    ValidatePlatInterrupt,                      NULL },
+  { L"Platform Interrupt Flags",                1,     6,   L"0x%x",  NULL,
+    (VOID **)&ExtendedPccSubspaceInterruptFlags,NULL,  NULL },
+  { L"Reserved",                                1,     7,   L"0x%x",  NULL,    NULL,NULL,                  NULL },
+  { L"Base Address",                            8,     8,   L"0x%lx", NULL,    NULL,NULL,                  NULL },
+  { L"Memory Range Length",                     4,     16,  L"0x%x",  NULL,    NULL,ValidateRangeLength4,
+    NULL },
+  { L"Doorbell Register",                       12,    20,  NULL,     DumpGas, NULL,
+    ValidatePccDoorbellGas,                     NULL },
+  { L"Doorbell Preserve",                       8,     32,  L"0x%lx", NULL,    NULL,NULL,                  NULL },
+  { L"Doorbell Write",                          8,     40,  L"0x%lx", NULL,    NULL,NULL,                  NULL },
+  { L"Nominal Latency",                         4,     48,  L"%u",    NULL,    NULL,NULL,                  NULL },
+  { L"Maximum Periodic Access Rate",            4,     52,  L"%u",    NULL,    NULL,NULL,                  NULL },
+  { L"Minimum Request Turnaround Time",         4,     56,  L"%u",    NULL,    NULL,NULL,                  NULL },
+  { L"Platform Interrupt Ack Register",         12,    60,  NULL,     DumpGas, NULL,
+    ValidatePccIntAckGas,                       NULL },
+  { L"Platform Interrupt Ack Preserve",         8,     72,  L"0x%lx", NULL,    NULL,NULL,                  NULL },
+  { L"Platform Interrupt Ack Set",              8,     80,  L"0x%lx", NULL,    NULL,NULL,                  NULL },
+  { L"Reserved",                                8,     88,  L"0x%lx", NULL,    NULL,NULL,                  NULL },
+  { L"Cmd Complete Check Reg Addr",             12,    96,  NULL,     DumpGas, NULL,
+    ValidatePccGas,                             NULL },
+  { L"Cmd Complete Check Mask",                 8,     108, L"0x%lx", NULL,    NULL,NULL,                  NULL },
+  { L"Cmd Update Reg Addr",                     12,    116, NULL,     DumpGas, NULL,
+    ValidatePccGas,                             NULL },
+  { L"Cmd Update Preserve mask",                8,     128, L"0x%lx", NULL,    NULL,NULL,                  NULL },
+  { L"Cmd Update Set mask",                     8,     136, L"0x%lx", NULL,    NULL,NULL,                  NULL },
+  { L"Error Status Register",                   12,    144, NULL,     DumpGas, NULL,
+    ValidatePccErrStatusGas,                    NULL },
+  { L"Error Status Mask",                       8,     156, L"0x%lx", NULL,    NULL,NULL,                  NULL },
+};
+
+/**
+  An ACPI_PARSER array describing the HW Registers based Communications
+  Subspace Structure - Type 5
+*/
+STATIC CONST ACPI_PARSER  PccSubspaceType5Parser[] = {
+  PCC_SUBSPACE_HEADER (),
+  { L"Version",            2,   2,  L"0x%x",  NULL,    NULL, NULL, NULL },
+  { L"Base Address",       8,   4,  L"0x%lx", NULL,    NULL, NULL, NULL },
+  { L"Shared Memory Range Length",8,   12, L"0x%lx", NULL,    NULL, NULL, NULL },
+  { L"Doorbell Register",  12,  20, NULL,     DumpGas, NULL,
+    ValidatePccMemoryIoGas,NULL },
+  { L"Doorbell Preserve",  8,   32, L"0x%lx", NULL,    NULL, NULL, NULL },
+  { L"Doorbell Write",     8,   40, L"0x%lx", NULL,    NULL, NULL, NULL },
+  { L"Command Complete Check Register",12,  48, NULL,     DumpGas, NULL,
+    ValidatePccMemoryIoGas,NULL },
+  { L"Command Complete Check Mask",8,   60, L"0x%lx", NULL,    NULL, NULL, NULL },
+  { L"Error Status Register",12,  68, NULL,     DumpGas, NULL,
+    ValidatePccMemoryIoGas,NULL },
+  { L"Error Status Mask",  8,   80, L"0x%lx", NULL,    NULL, NULL, NULL },
+  { L"Nominal Latency",    4,   88, L"0x%x",  NULL,    NULL, NULL, NULL },
+  { L"Minimum Request Turnaround Time",4,   92, L"0x%x",  NULL,    NULL, NULL, NULL }
 };
 
@@ -377 +404 @@
 VOID
 DumpPccSubspaceType0 (
-  IN UINT8* Ptr,
+  IN UINT8  *Ptr,
   IN UINT8  Length
   )
@@ -400 +427 @@
 VOID
 DumpPccSubspaceType1 (
-  IN UINT8* Ptr,
+  IN UINT8  *Ptr,
   IN UINT8  Length
   )
@@ -423 +450 @@
 VOID
 DumpPccSubspaceType2 (
-  IN UINT8* Ptr,
+  IN UINT8  *Ptr,
   IN UINT8  Length
   )
@@ -446 +473 @@
 VOID
 DumpPccSubspaceType3 (
-  IN UINT8* Ptr,
+  IN UINT8  *Ptr,
   IN UINT8  Length
   )
@@ -469 +496 @@
 VOID
 DumpPccSubspaceType4 (
-  IN UINT8* Ptr,
+  IN UINT8  *Ptr,
   IN UINT8  Length
   )
@@ -484 +511 @@
 
 /**
+  This function parses the PCC Subspace type 5.
+
+  @param [in] Ptr     Pointer to the start of the Subspace Structure.
+  @param [in] Length  Length of the Subspace Structure.
+**/
+STATIC
+VOID
+DumpPccSubspaceType5 (
+  IN UINT8  *Ptr,
+  IN UINT8  Length
+  )
+{
+  ParseAcpi (
+    TRUE,
+    2,
+    "Subspace Type 5",
+    Ptr,
+    Length,
+    PARSER_PARAMS (PccSubspaceType5Parser)
+    );
+}
+
+/**
   This function parses the ACPI PCCT table including its sub-structures
   of type 0 through 4.
@@ -499 +549 @@
 EFIAPI
 ParseAcpiPcct (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
-  )
-{
-  UINT32 Offset;
-  UINT8* PccSubspacePtr;
-  UINTN  SubspaceCount;
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
+  )
+{
+  UINT32  Offset;
+  UINT8   *PccSubspacePtr;
+  UINTN   SubspaceCount;
 
   if (!Trace) {
@@ -539 +589 @@
     // successfully read.
     if ((PccSubspaceType == NULL) ||
-        (PccSubspaceLength == NULL)) {
+        (PccSubspaceLength == NULL))
+    {
       IncrementErrorCount ();
       Print (
         L"ERROR: Insufficient remaining table buffer length to read the " \
-          L"structure header. Length = %u.\n",
+        L"structure header. Length = %u.\n",
         AcpiTableLength - Offset
         );
@@ -551 +602 @@
     // Validate Structure length
     if ((*PccSubspaceLength == 0) ||
-        ((Offset + (*PccSubspaceLength)) > AcpiTableLength)) {
+        ((Offset + (*PccSubspaceLength)) > AcpiTableLength))
+    {
       IncrementErrorCount ();
       Print (
         L"ERROR: Invalid Structure length. " \
-          L"Length = %u. Offset = %u. AcpiTableLength = %u.\n",
+        L"Length = %u. Offset = %u. AcpiTableLength = %u.\n",
         *PccSubspaceLength,
         Offset,
@@ -564 +616 @@
 
     switch (*PccSubspaceType) {
-      case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_GENERIC:
+      case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_GENERIC:
         DumpPccSubspaceType0 (
           PccSubspacePtr,
@@ -570 +622 @@
           );
         break;
-      case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_1_HW_REDUCED_COMMUNICATIONS:
+      case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_1_HW_REDUCED_COMMUNICATIONS:
         DumpPccSubspaceType1 (
           PccSubspacePtr,
@@ -576 +628 @@
           );
         break;
-      case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_2_HW_REDUCED_COMMUNICATIONS:
+      case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_2_HW_REDUCED_COMMUNICATIONS:
         DumpPccSubspaceType2 (
           PccSubspacePtr,
@@ -582 +634 @@
           );
         break;
-      case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_3_EXTENDED_PCC:
+      case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_3_EXTENDED_PCC:
         DumpPccSubspaceType3 (
           PccSubspacePtr,
@@ -588 +640 @@
           );
         break;
-      case EFI_ACPI_6_3_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC:
+      case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_4_EXTENDED_PCC:
         DumpPccSubspaceType4 (
+          PccSubspacePtr,
+          *PccSubspaceLength
+          );
+        break;
+      case EFI_ACPI_6_4_PCCT_SUBSPACE_TYPE_5_HW_REGISTERS_COMMUNICATIONS:
+        DumpPccSubspaceType5 (
           PccSubspacePtr,
           *PccSubspaceLength
@@ -598 +656 @@
         Print (
           L"ERROR: Unknown PCC subspace structure:"
-            L" Type = %u, Length = %u\n",
+          L" Type = %u, Length = %u\n",
           PccSubspaceType,
           *PccSubspaceLength
@@ -605 +663 @@
 
     PccSubspacePtr += *PccSubspaceLength;
-    Offset += *PccSubspaceLength;
+    Offset         += *PccSubspaceLength;
     SubspaceCount++;
   } // while

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pcct/PcctParser.h

@@ -12 +12 @@
   Minimum value for the 'length' field in subspaces of types 0, 1 and 2.
 */
-#define MIN_MEMORY_RANGE_LENGTH                 8
+#define MIN_MEMORY_RANGE_LENGTH  8
 
 /**
   Minimum value for the 'length' field in subspaces of types 3 and 4.
 */
-#define MIN_EXT_PCC_SUBSPACE_MEM_RANGE_LEN      16
+#define MIN_EXT_PCC_SUBSPACE_MEM_RANGE_LEN  16
 
 /**
   Maximum number of PCC subspaces.
 */
-#define MAX_PCC_SUBSPACES                       256
+#define MAX_PCC_SUBSPACES  256
 
 /**

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c

@@ -2 +2 @@
   PPTT table parser
 
-  Copyright (c) 2019 - 2020, ARM Limited. All rights reserved.
+  Copyright (c) 2019 - 2021, ARM Limited. All rights reserved.
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @par Reference(s):
-    - ACPI 6.3 Specification - January 2019
+    - ACPI 6.4 Specification - January 2021
     - ARM Architecture Reference Manual ARMv8 (D.a)
 **/
@@ -18 +18 @@
 
 // Local variables
-STATIC CONST UINT8*  ProcessorTopologyStructureType;
-STATIC CONST UINT8*  ProcessorTopologyStructureLength;
-STATIC CONST UINT32* NumberOfPrivateResources;
-STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
+STATIC CONST UINT8                                    *ProcessorTopologyStructureType;
+STATIC CONST UINT8                                    *ProcessorTopologyStructureLength;
+STATIC CONST UINT32                                   *NumberOfPrivateResources;
+STATIC CONST EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE_FLAGS  *CacheFlags;
+STATIC ACPI_DESCRIPTION_HEADER_INFO                   AcpiHdrInfo;
+
+#if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
+
+/**
+  Increment the error count and print an error that a required flag is missing.
+
+  @param [in] FlagName  Name of the missing flag.
+**/
+STATIC
+VOID
+EFIAPI
+LogCacheFlagError (
+  IN CONST CHAR16  *FlagName
+  )
+{
+  IncrementErrorCount ();
+  Print (
+    L"\nERROR: On Arm based systems, all cache properties must be"
+    L" provided in the cache type structure."
+    L" Missing '%s' flag.",
+    FlagName
+    );
+}
+
+#endif
+
+/**
+  This function validates the Cache Type Structure (Type 1) Cache Flags field.
+
+  @param [in] Ptr     Pointer to the start of the field data.
+  @param [in] Context Pointer to context specific information e.g. this
+                      could be a pointer to the ACPI table header.
+**/
+STATIC
+VOID
+EFIAPI
+ValidateCacheFlags (
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+ #if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
+  CacheFlags = (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE_FLAGS *)Ptr;
+
+  if (CacheFlags == NULL) {
+    IncrementErrorCount ();
+    Print (L"\nERROR: Cache Structure Flags were not successfully read.");
+    return;
+  }
+
+  if (CacheFlags->SizePropertyValid == EFI_ACPI_6_4_PPTT_CACHE_SIZE_INVALID) {
+    LogCacheFlagError (L"Size Property Valid");
+  }
+
+  if (CacheFlags->NumberOfSetsValid == EFI_ACPI_6_4_PPTT_NUMBER_OF_SETS_INVALID) {
+    LogCacheFlagError (L"Number Of Sets Valid");
+  }
+
+  if (CacheFlags->AssociativityValid == EFI_ACPI_6_4_PPTT_ASSOCIATIVITY_INVALID) {
+    LogCacheFlagError (L"Associativity Valid");
+  }
+
+  if (CacheFlags->AllocationTypeValid == EFI_ACPI_6_4_PPTT_ALLOCATION_TYPE_INVALID) {
+    LogCacheFlagError (L"Allocation Type Valid");
+  }
+
+  if (CacheFlags->CacheTypeValid == EFI_ACPI_6_4_PPTT_CACHE_TYPE_INVALID) {
+    LogCacheFlagError (L"Cache Type Valid");
+  }
+
+  if (CacheFlags->WritePolicyValid == EFI_ACPI_6_4_PPTT_WRITE_POLICY_INVALID) {
+    LogCacheFlagError (L"Write Policy Valid");
+  }
+
+  if (CacheFlags->LineSizeValid == EFI_ACPI_6_4_PPTT_LINE_SIZE_INVALID) {
+    LogCacheFlagError (L"Line Size Valid");
+  }
+
+  // Cache ID was only introduced in revision 3
+  if (*(AcpiHdrInfo.Revision) >= 3) {
+    if (CacheFlags->CacheIdValid == EFI_ACPI_6_4_PPTT_CACHE_ID_INVALID) {
+      LogCacheFlagError (L"Cache Id Valid");
+    }
+  }
+
+ #endif
+}
 
 /**
@@ -35 +123 @@
 EFIAPI
 ValidateCacheNumberOfSets (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-  )
-{
-  UINT32 NumberOfSets;
-  NumberOfSets = *(UINT32*)Ptr;
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  UINT32  NumberOfSets;
+
+  NumberOfSets = *(UINT32 *)Ptr;
 
   if (NumberOfSets == 0) {
@@ -48 +137 @@
   }
 
-#if defined(MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
+ #if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
   if (NumberOfSets > PPTT_ARM_CCIDX_CACHE_NUMBER_OF_SETS_MAX) {
     IncrementErrorCount ();
     Print (
       L"\nERROR: When ARMv8.3-CCIDX is implemented the maximum cache number of "
-        L"sets must be less than or equal to %d",
+      L"sets must be less than or equal to %d",
       PPTT_ARM_CCIDX_CACHE_NUMBER_OF_SETS_MAX
       );
@@ -63 +152 @@
     Print (
       L"\nWARNING: Without ARMv8.3-CCIDX, the maximum cache number of sets "
-        L"must be less than or equal to %d. Ignore this message if "
-        L"ARMv8.3-CCIDX is implemented",
+      L"must be less than or equal to %d. Ignore this message if "
+      L"ARMv8.3-CCIDX is implemented",
       PPTT_ARM_CACHE_NUMBER_OF_SETS_MAX
       );
     return;
   }
-#endif
-
+
+ #endif
 }
 
@@ -85 +174 @@
 EFIAPI
 ValidateCacheAssociativity (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-  )
-{
-  UINT8 Associativity;
-  Associativity = *(UINT8*)Ptr;
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  UINT8  Associativity;
+
+  Associativity = *(UINT8 *)Ptr;
 
   if (Associativity == 0) {
@@ -110 +200 @@
 EFIAPI
 ValidateCacheLineSize (
-  IN UINT8* Ptr,
-  IN VOID*  Context
-  )
-{
-#if defined(MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+ #if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
   // Reference: ARM Architecture Reference Manual ARMv8 (D.a)
   // Section D12.2.25: CCSIDR_EL1, Current Cache Size ID Register
@@ -120 +210 @@
   //     (Log2(Number of bytes in cache line)) - 4.
 
-  UINT16 LineSize;
-  LineSize = *(UINT16*)Ptr;
+  UINT16  LineSize;
+  LineSize = *(UINT16 *)Ptr;
 
   if ((LineSize < PPTT_ARM_CACHE_LINE_SIZE_MIN) ||
-      (LineSize > PPTT_ARM_CACHE_LINE_SIZE_MAX)) {
+      (LineSize > PPTT_ARM_CACHE_LINE_SIZE_MAX))
+  {
     IncrementErrorCount ();
     Print (
       L"\nERROR: The cache line size must be between %d and %d bytes"
-        L" on ARM Platforms.",
+      L" on ARM Platforms.",
       PPTT_ARM_CACHE_LINE_SIZE_MIN,
       PPTT_ARM_CACHE_LINE_SIZE_MAX
@@ -139 +230 @@
     Print (L"\nERROR: The cache line size is not a power of 2.");
   }
-#endif
-}
-
-/**
-  This function validates the Cache Type Structure (Type 1) Attributes field.
+
+ #endif
+}
+
+/**
+  This function validates the Cache Type Structure (Type 1) Cache ID field.
 
   @param [in] Ptr     Pointer to the start of the field data.
@@ -152 +244 @@
 VOID
 EFIAPI
+ValidateCacheId (
+  IN UINT8  *Ptr,
+  IN VOID   *Context
+  )
+{
+  UINT32  CacheId;
+
+  CacheId = *(UINT32 *)Ptr;
+
+  // Cache ID was only introduced in revision 3
+  if (*(AcpiHdrInfo.Revision) < 3) {
+    return;
+  }
+
+  if (CacheFlags == NULL) {
+    IncrementErrorCount ();
+    Print (L"\nERROR: Cache Structure Flags were not successfully read.");
+    return;
+  }
+
+  if (CacheFlags->CacheIdValid == EFI_ACPI_6_4_PPTT_CACHE_ID_VALID) {
+    if (CacheId == 0) {
+      IncrementErrorCount ();
+      Print (L"\nERROR: 0 is not a valid Cache ID.");
+      return;
+    }
+  }
+}
+
+/**
+  This function validates the Cache Type Structure (Type 1) Attributes field.
+
+  @param [in] Ptr     Pointer to the start of the field data.
+  @param [in] Context Pointer to context specific information e.g. this
+                      could be a pointer to the ACPI table header.
+**/
+STATIC
+VOID
+EFIAPI
 ValidateCacheAttributes (
-  IN UINT8* Ptr,
-  IN VOID*  Context
+  IN UINT8  *Ptr,
+  IN VOID   *Context
   )
 {
   // Reference: Advanced Configuration and Power Interface (ACPI) Specification
-  //            Version 6.2 Errata A, September 2017
-  // Table 5-153: Cache Type Structure
-  UINT8 Attributes;
-  Attributes = *(UINT8*)Ptr;
+  //            Version 6.4, January 2021
+  // Table 5-140: Cache Type Structure
+  UINT8  Attributes;
+
+  Attributes = *(UINT8 *)Ptr;
 
   if ((Attributes & 0xE0) != 0) {
@@ -176 +308 @@
   An ACPI_PARSER array describing the ACPI PPTT Table.
 **/
-STATIC CONST ACPI_PARSER PpttParser[] = {
+STATIC CONST ACPI_PARSER  PpttParser[] = {
   PARSE_ACPI_HEADER (&AcpiHdrInfo)
 };
@@ -183 +315 @@
   An ACPI_PARSER array describing the processor topology structure header.
 **/
-STATIC CONST ACPI_PARSER ProcessorTopologyStructureHeaderParser[] = {
-  {L"Type", 1, 0, NULL, NULL, (VOID**)&ProcessorTopologyStructureType,
-   NULL, NULL},
-  {L"Length", 1, 1, NULL, NULL, (VOID**)&ProcessorTopologyStructureLength,
-   NULL, NULL},
-  {L"Reserved", 2, 2, NULL, NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  ProcessorTopologyStructureHeaderParser[] = {
+  { L"Type",     1, 0, NULL, NULL, (VOID **)&ProcessorTopologyStructureType,
+    NULL, NULL },
+  { L"Length",   1, 1, NULL, NULL, (VOID **)&ProcessorTopologyStructureLength,
+    NULL, NULL },
+  { L"Reserved", 2, 2, NULL, NULL, NULL,                                      NULL,NULL }
 };
 
@@ -194 +326 @@
   An ACPI_PARSER array describing the Processor Hierarchy Node Structure - Type 0.
 **/
-STATIC CONST ACPI_PARSER ProcessorHierarchyNodeStructureParser[] = {
-  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL},
-  {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"Flags", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Parent", 4, 8, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"ACPI Processor ID", 4, 12, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Number of private resources", 4, 16, L"%d", NULL,
-   (VOID**)&NumberOfPrivateResources, NULL, NULL}
+STATIC CONST ACPI_PARSER  ProcessorHierarchyNodeStructureParser[] = {
+  { L"Type",                        1, 0,  L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Length",                      1, 1,  L"%d",   NULL, NULL, NULL, NULL },
+  { L"Reserved",                    2, 2,  L"0x%x", NULL, NULL, NULL, NULL },
+
+  { L"Flags",                       4, 4,  L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Parent",                      4, 8,  L"0x%x", NULL, NULL, NULL, NULL },
+  { L"ACPI Processor ID",           4, 12, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Number of private resources", 4, 16, L"%d",   NULL,
+    (VOID **)&NumberOfPrivateResources, NULL, NULL }
 };
 
@@ -209 +341 @@
   An ACPI_PARSER array describing the Cache Type Structure - Type 1.
 **/
-STATIC CONST ACPI_PARSER CacheTypeStructureParser[] = {
-  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL},
-  {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"Flags", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Next Level of Cache", 4, 8, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Size", 4, 12, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Number of sets", 4, 16, L"%d", NULL, NULL, ValidateCacheNumberOfSets, NULL},
-  {L"Associativity", 1, 20, L"%d", NULL, NULL, ValidateCacheAssociativity, NULL},
-  {L"Attributes", 1, 21, L"0x%x", NULL, NULL, ValidateCacheAttributes, NULL},
-  {L"Line size", 2, 22, L"%d", NULL, NULL, ValidateCacheLineSize, NULL}
-};
-
-/**
-  An ACPI_PARSER array describing the ID Type Structure - Type 2.
-**/
-STATIC CONST ACPI_PARSER IdStructureParser[] = {
-  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL},
-  {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"VENDOR_ID", 4, 4, NULL, Dump4Chars, NULL, NULL, NULL},
-  {L"LEVEL_1_ID", 8, 8, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"LEVEL_2_ID", 8, 16, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"MAJOR_REV", 2, 24, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"MINOR_REV", 2, 26, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"SPIN_REV", 2, 28, L"0x%x", NULL, NULL, NULL, NULL},
+STATIC CONST ACPI_PARSER  CacheTypeStructureParser[] = {
+  { L"Type",                1, 0,  L"0x%x", NULL, NULL,                 NULL,                       NULL },
+  { L"Length",              1, 1,  L"%d",   NULL, NULL,                 NULL,                       NULL },
+  { L"Reserved",            2, 2,  L"0x%x", NULL, NULL,                 NULL,                       NULL },
+
+  { L"Flags",               4, 4,  L"0x%x", NULL, (VOID **)&CacheFlags, ValidateCacheFlags,
+    NULL },
+  { L"Next Level of Cache", 4, 8,  L"0x%x", NULL, NULL,                 NULL,                       NULL },
+  { L"Size",                4, 12, L"0x%x", NULL, NULL,                 NULL,                       NULL },
+  { L"Number of sets",      4, 16, L"%d",   NULL, NULL,                 ValidateCacheNumberOfSets,  NULL },
+  { L"Associativity",       1, 20, L"%d",   NULL, NULL,                 ValidateCacheAssociativity, NULL },
+  { L"Attributes",          1, 21, L"0x%x", NULL, NULL,                 ValidateCacheAttributes,    NULL },
+  { L"Line size",           2, 22, L"%d",   NULL, NULL,                 ValidateCacheLineSize,      NULL },
+  { L"Cache ID",            4, 24, L"%d",   NULL, NULL,                 ValidateCacheId,            NULL }
 };
 
@@ -249 +367 @@
 VOID
 DumpProcessorHierarchyNodeStructure (
-  IN UINT8* Ptr,
+  IN UINT8  *Ptr,
   IN UINT8  Length
   )
 {
-  UINT32 Offset;
-  UINT32 Index;
-  CHAR16 Buffer[OUTPUT_FIELD_COLUMN_WIDTH];
+  UINT32  Offset;
+  UINT32  Index;
+  CHAR16  Buffer[OUTPUT_FIELD_COLUMN_WIDTH];
 
   Offset = ParseAcpi (
@@ -282 +400 @@
     Print (
       L"ERROR: Invalid Number of Private Resources. " \
-        L"PrivateResourceCount = %d. RemainingBufferLength = %d. " \
-        L"Parsing of this structure aborted.\n",
+      L"PrivateResourceCount = %d. RemainingBufferLength = %d. " \
+      L"Parsing of this structure aborted.\n",
       *NumberOfPrivateResources,
       Length - Offset
@@ -305 +423 @@
     Print (
       L"0x%x\n",
-      *((UINT32*)(Ptr + Offset))
+      *((UINT32 *)(Ptr + Offset))
       );
 
@@ -322 +440 @@
 VOID
 DumpCacheTypeStructure (
-  IN UINT8* Ptr,
+  IN UINT8  *Ptr,
   IN UINT8  Length
   )
@@ -337 +455 @@
 
 /**
-  This function parses the ID Structure (Type 2).
-
-  @param [in] Ptr     Pointer to the start of the ID Structure data.
-  @param [in] Length  Length of the ID Structure.
-**/
-STATIC
-VOID
-DumpIDStructure (
-  IN UINT8* Ptr,
-  IN UINT8 Length
-  )
-{
-  ParseAcpi (
-    TRUE,
-    2,
-    "ID Structure",
-    Ptr,
-    Length,
-    PARSER_PARAMS (IdStructureParser)
-    );
-}
-
-/**
   This function parses the ACPI PPTT table.
   When trace is enabled this function parses the PPTT table and
@@ -367 +462 @@
     - Processor hierarchy node structure (Type 0)
     - Cache Type Structure (Type 1)
-    - ID structure (Type 2)
 
   This function also performs validation of the ACPI table fields.
@@ -379 +473 @@
 EFIAPI
 ParseAcpiPptt (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
-  )
-{
-  UINT32 Offset;
-  UINT8* ProcessorTopologyStructurePtr;
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
+  )
+{
+  UINT32  Offset;
+  UINT8   *ProcessorTopologyStructurePtr;
 
   if (!Trace) {
@@ -417 +511 @@
     // successfully read.
     if ((ProcessorTopologyStructureType == NULL) ||
-        (ProcessorTopologyStructureLength == NULL)) {
+        (ProcessorTopologyStructureLength == NULL))
+    {
       IncrementErrorCount ();
       Print (
         L"ERROR: Insufficient remaining table buffer length to read the " \
-          L"processor topology structure header. Length = %d.\n",
+        L"processor topology structure header. Length = %d.\n",
         AcpiTableLength - Offset
         );
@@ -429 +524 @@
     // Validate Processor Topology Structure length
     if ((*ProcessorTopologyStructureLength == 0) ||
-        ((Offset + (*ProcessorTopologyStructureLength)) > AcpiTableLength)) {
+        ((Offset + (*ProcessorTopologyStructureLength)) > AcpiTableLength))
+    {
       IncrementErrorCount ();
       Print (
         L"ERROR: Invalid Processor Topology Structure length. " \
-          L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
+        L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
         *ProcessorTopologyStructureLength,
         Offset,
@@ -445 +541 @@
 
     switch (*ProcessorTopologyStructureType) {
-      case EFI_ACPI_6_2_PPTT_TYPE_PROCESSOR:
+      case EFI_ACPI_6_4_PPTT_TYPE_PROCESSOR:
         DumpProcessorHierarchyNodeStructure (
           ProcessorTopologyStructurePtr,
@@ -451 +547 @@
           );
         break;
-      case EFI_ACPI_6_2_PPTT_TYPE_CACHE:
+      case EFI_ACPI_6_4_PPTT_TYPE_CACHE:
         DumpCacheTypeStructure (
           ProcessorTopologyStructurePtr,
@@ -457 +553 @@
           );
         break;
-      case EFI_ACPI_6_2_PPTT_TYPE_ID:
-        DumpIDStructure (
-          ProcessorTopologyStructurePtr,
-          *ProcessorTopologyStructureLength
+      case EFI_ACPI_6_3_PPTT_TYPE_ID:
+        IncrementErrorCount ();
+        Print (
+          L"ERROR: PPTT Type 2 - Processor ID has been removed and must not be"
+          L"used.\n"
           );
         break;
@@ -467 +564 @@
         Print (
           L"ERROR: Unknown processor topology structure:"
-            L" Type = %d, Length = %d\n",
+          L" Type = %d, Length = %d\n",
           *ProcessorTopologyStructureType,
           *ProcessorTopologyStructureLength
@@ -474 +571 @@
 
     ProcessorTopologyStructurePtr += *ProcessorTopologyStructureLength;
-    Offset += *ProcessorTopologyStructureLength;
+    Offset                        += *ProcessorTopologyStructureLength;
   } // while
 }

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.h

@@ -17 +17 @@
 /// ARMv8.3-CCIDX (Cache extended number of sets)
 /// Derived from CCSIDR_EL1 when ID_AA64MMFR2_EL1.CCIDX==0001
-#define PPTT_ARM_CCIDX_CACHE_NUMBER_OF_SETS_MAX       (1 << 24)
-#define PPTT_ARM_CCIDX_CACHE_ASSOCIATIVITY_MAX        (1 << 21)
+#define PPTT_ARM_CCIDX_CACHE_NUMBER_OF_SETS_MAX  (1 << 24)
+#define PPTT_ARM_CCIDX_CACHE_ASSOCIATIVITY_MAX   (1 << 21)
 
 /// Cache parameters allowed by the architecture without
 /// ARMv8.3-CCIDX (Cache extended number of sets)
 /// Derived from CCSIDR_EL1 when ID_AA64MMFR2_EL1.CCIDX==0000
-#define PPTT_ARM_CACHE_NUMBER_OF_SETS_MAX             (1 << 15)
-#define PPTT_ARM_CACHE_ASSOCIATIVITY_MAX              (1 << 10)
+#define PPTT_ARM_CACHE_NUMBER_OF_SETS_MAX  (1 << 15)
+#define PPTT_ARM_CACHE_ASSOCIATIVITY_MAX   (1 << 10)
 
 /// Common cache parameters
@@ -31 +31 @@
 /// (Log2(Number of bytes in cache line)) - 4 is used to represent
 /// the LineSize bits.
-#define PPTT_ARM_CACHE_LINE_SIZE_MAX                  (1 << 11)
-#define PPTT_ARM_CACHE_LINE_SIZE_MIN                  (1 << 4)
+#define PPTT_ARM_CACHE_LINE_SIZE_MAX  (1 << 11)
+#define PPTT_ARM_CACHE_LINE_SIZE_MIN  (1 << 4)
 
 #endif // if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rsdp/RsdpParser.c

@@ -14 +14 @@
 
 // Local Variables
-STATIC CONST UINT64* XsdtAddress;
+STATIC CONST UINT64  *XsdtAddress;
 
 /**
@@ -27 +27 @@
 EFIAPI
 ValidateRsdtAddress (
-  IN UINT8* Ptr,
-  IN VOID*  Context
+  IN UINT8  *Ptr,
+  IN VOID   *Context
   )
 {
-#if defined(MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
+ #if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
   // Reference: Server Base Boot Requirements System Software on ARM Platforms
   // Section: 4.2.1.1 RSDP
@@ -37 +37 @@
   //   - Within the RSDP, the RsdtAddress field must be null (zero) and the
   //     XsdtAddresss MUST be a valid, non-null, 64-bit value.
-  UINT32 RsdtAddr;
+  UINT32  RsdtAddr;
 
-  RsdtAddr = *(UINT32*)Ptr;
+  RsdtAddr = *(UINT32 *)Ptr;
 
   if (RsdtAddr != 0) {
@@ -48 +48 @@
       );
   }
-#endif
+
+ #endif
 }
 
@@ -62 +63 @@
 EFIAPI
 ValidateXsdtAddress (
-  IN UINT8* Ptr,
-  IN VOID*  Context
+  IN UINT8  *Ptr,
+  IN VOID   *Context
   )
 {
-#if defined(MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
+ #if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
   // Reference: Server Base Boot Requirements System Software on ARM Platforms
   // Section: 4.2.1.1 RSDP
@@ -72 +73 @@
   //   - Within the RSDP, the RsdtAddress field must be null (zero) and the
   //     XsdtAddresss MUST be a valid, non-null, 64-bit value.
-  UINT64 XsdtAddr;
+  UINT64  XsdtAddr;
 
-  XsdtAddr = *(UINT64*)Ptr;
+  XsdtAddr = *(UINT64 *)Ptr;
 
   if (XsdtAddr == 0) {
@@ -83 +84 @@
       );
   }
-#endif
+
+ #endif
 }
 
@@ -89 +91 @@
   An array describing the ACPI RSDP Table.
 **/
-STATIC CONST ACPI_PARSER RsdpParser[] = {
-  {L"Signature", 8, 0, NULL, Dump8Chars, NULL, NULL, NULL},
-  {L"Checksum", 1, 8, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Oem ID", 6, 9, NULL, Dump6Chars, NULL, NULL, NULL},
-  {L"Revision", 1, 15, L"%d", NULL, NULL, NULL, NULL},
-  {L"RSDT Address", 4, 16, L"0x%x", NULL, NULL, ValidateRsdtAddress, NULL},
-  {L"Length", 4, 20, L"%d", NULL, NULL, NULL, NULL},
-  {L"XSDT Address", 8, 24, L"0x%lx", NULL, (VOID**)&XsdtAddress,
-   ValidateXsdtAddress, NULL},
-  {L"Extended Checksum", 1, 32, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 3, 33, L"%x %x %x", Dump3Chars, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  RsdpParser[] = {
+  { L"Signature",         8, 0,  NULL,        Dump8Chars, NULL,                  NULL,                NULL },
+  { L"Checksum",          1, 8,  L"0x%x",     NULL,       NULL,                  NULL,                NULL },
+  { L"Oem ID",            6, 9,  NULL,        Dump6Chars, NULL,                  NULL,                NULL },
+  { L"Revision",          1, 15, L"%d",       NULL,       NULL,                  NULL,                NULL },
+  { L"RSDT Address",      4, 16, L"0x%x",     NULL,       NULL,                  ValidateRsdtAddress, NULL },
+  { L"Length",            4, 20, L"%d",       NULL,       NULL,                  NULL,                NULL },
+  { L"XSDT Address",      8, 24, L"0x%lx",    NULL,       (VOID **)&XsdtAddress,
+    ValidateXsdtAddress, NULL },
+  { L"Extended Checksum", 1, 32, L"0x%x",     NULL,       NULL,                  NULL,                NULL },
+  { L"Reserved",          3, 33, L"%x %x %x", Dump3Chars, NULL,                  NULL,                NULL }
 };
 
@@ -119 +121 @@
 EFIAPI
 ParseAcpiRsdp (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
   )
 {
@@ -145 +147 @@
     Print (
       L"ERROR: Insufficient table length. AcpiTableLength = %d." \
-        L"RSDP parsing aborted.\n",
+      L"RSDP parsing aborted.\n",
       AcpiTableLength
       );
@@ -161 +163 @@
   }
 
-  ProcessAcpiTable ((UINT8*)(UINTN)(*XsdtAddress));
+  ProcessAcpiTable ((UINT8 *)(UINTN)(*XsdtAddress));
 }

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c

@@ -16 +16 @@
 
 // Local Variables
-STATIC CONST UINT64* SlitSystemLocalityCount;
-STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
+STATIC CONST UINT64                  *SlitSystemLocalityCount;
+STATIC ACPI_DESCRIPTION_HEADER_INFO  AcpiHdrInfo;
 
 /**
   An ACPI_PARSER array describing the ACPI SLIT table.
 **/
-STATIC CONST ACPI_PARSER SlitParser[] = {
+STATIC CONST ACPI_PARSER  SlitParser[] = {
   PARSE_ACPI_HEADER (&AcpiHdrInfo),
-  {L"Number of System Localities", 8, 36, L"0x%lx", NULL,
-   (VOID**)&SlitSystemLocalityCount, NULL, NULL}
+  { L"Number of System Localities",   8,     36, L"0x%lx", NULL,
+    (VOID **)&SlitSystemLocalityCount,NULL,  NULL }
 };
 
@@ -31 +31 @@
   Macro to get the value of a System Locality
 **/
-#define SLIT_ELEMENT(Ptr, i, j) *(Ptr + (i * LocalityCount) + j)
+#define SLIT_ELEMENT(Ptr, i, j)  *(Ptr + (i * LocalityCount) + j)
 
 /**
@@ -51 +51 @@
 EFIAPI
 ParseAcpiSlit (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
   )
 {
-  UINT32 Offset;
-  UINT32 Count;
-  UINT32 Index;
-  UINT32 LocalityCount;
-  UINT8* LocalityPtr;
-  CHAR16 Buffer[80];  // Used for AsciiName param of ParseAcpi
+  UINT32  Offset;
+  UINT32  Count;
+  UINT32  Index;
+  UINT32  LocalityCount;
+  UINT8   *LocalityPtr;
+  CHAR16  Buffer[80]; // Used for AsciiName param of ParseAcpi
 
   if (!Trace) {
@@ -104 +104 @@
     Print (
       L"ERROR: The Number of System Localities provided can't be represented " \
-        L"in the SLIT table. SlitSystemLocalityCount = %ld. " \
-        L"MaxLocalityCountAllowed = %d.\n",
+      L"in the SLIT table. SlitSystemLocalityCount = %ld. " \
+      L"MaxLocalityCountAllowed = %d.\n",
       *SlitSystemLocalityCount,
       MAX_UINT16
@@ -119 +119 @@
     Print (
       L"ERROR: Invalid Number of System Localities. " \
-        L"SlitSystemLocalityCount = %ld. AcpiTableLength = %d.\n",
+      L"SlitSystemLocalityCount = %ld. AcpiTableLength = %d.\n",
       *SlitSystemLocalityCount,
       AcpiTableLength
@@ -145 +145 @@
       Print (L" (%3d) ", Index);
     }
+
     Print (L"\n");
-    for (Count = 0; Count< LocalityCount; Count++) {
+    for (Count = 0; Count < LocalityCount; Count++) {
       Print (L" (%3d) ", Count);
       for (Index = 0; Index < LocalityCount; Index++) {
         Print (L"  %3d  ", SLIT_ELEMENT (LocalityPtr, Count, Index));
       }
+
       Print (L"\n");
     }
@@ -159 +161 @@
     for (Index = 0; Index < LocalityCount; Index++) {
       // Element[x][x] must be equal to 10
-      if ((Count == Index) && (SLIT_ELEMENT (LocalityPtr, Count,Index) != 10)) {
+      if ((Count == Index) && (SLIT_ELEMENT (LocalityPtr, Count, Index) != 10)) {
         IncrementErrorCount ();
         Print (
           L"ERROR: Diagonal Element[0x%lx][0x%lx] (%3d)."
-            L" Normalized Value is not 10\n",
+          L" Normalized Value is not 10\n",
           Count,
           Index,
@@ -169 +171 @@
           );
       }
+
       // Element[i][j] must be equal to Element[j][i]
       if (SLIT_ELEMENT (LocalityPtr, Count, Index) !=
-          SLIT_ELEMENT (LocalityPtr, Index, Count)) {
+          SLIT_ELEMENT (LocalityPtr, Index, Count))
+      {
         IncrementErrorCount ();
         Print (
           L"ERROR: Relative distances for Element[0x%lx][0x%lx] (%3d) and \n"
-           L"Element[0x%lx][0x%lx] (%3d) do not match.\n",
+          L"Element[0x%lx][0x%lx] (%3d) do not match.\n",
           Count,
           Index,

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Spcr/SpcrParser.c

@@ -17 +17 @@
 
 // Local variables
-STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
+STATIC ACPI_DESCRIPTION_HEADER_INFO  AcpiHdrInfo;
 
 /**
@@ -30 +30 @@
 EFIAPI
 ValidateInterruptType (
-  IN UINT8* Ptr,
-  IN VOID*  Context
+  IN UINT8  *Ptr,
+  IN VOID   *Context
   )
 {
-#if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
-  UINT8 InterruptType;
+ #if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
+  UINT8  InterruptType;
 
   InterruptType = *Ptr;
 
   if (InterruptType !=
-        EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_INTERRUPT_TYPE_GIC) {
+      EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_INTERRUPT_TYPE_GIC)
+  {
     IncrementErrorCount ();
     Print (
@@ -47 +48 @@
       );
   }
-#endif
+
+ #endif
 }
 
@@ -61 +63 @@
 EFIAPI
 ValidateIrq (
-  IN UINT8* Ptr,
-  IN VOID*  Context
+  IN UINT8  *Ptr,
+  IN VOID   *Context
   )
 {
-#if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
-  UINT8 Irq;
+ #if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
+  UINT8  Irq;
 
   Irq = *Ptr;
@@ -77 +79 @@
       );
   }
-#endif
+
+ #endif
 }
 
@@ -83 +86 @@
   An ACPI_PARSER array describing the ACPI SPCR Table.
 **/
-STATIC CONST ACPI_PARSER SpcrParser[] = {
+STATIC CONST ACPI_PARSER  SpcrParser[] = {
   PARSE_ACPI_HEADER (&AcpiHdrInfo),
-  {L"Interface Type", 1, 36, L"%d", NULL, NULL, NULL, NULL},
-  {L"Reserved", 3, 37, L"%x %x %x", Dump3Chars, NULL, NULL, NULL},
-  {L"Base Address", 12, 40, NULL, DumpGas, NULL, NULL, NULL},
-  {L"Interrupt Type", 1, 52, L"%d", NULL, NULL, ValidateInterruptType, NULL},
-  {L"IRQ", 1, 53, L"%d", NULL, NULL, ValidateIrq, NULL},
-  {L"Global System Interrupt", 4, 54, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Baud Rate", 1, 58, L"%d", NULL, NULL, NULL, NULL},
-  {L"Parity", 1, 59, L"%d", NULL, NULL, NULL, NULL},
-  {L"Stop Bits", 1, 60, L"%d", NULL, NULL, NULL, NULL},
-  {L"Flow Control", 1, 61, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Terminal Type", 1, 62, L"%d", NULL, NULL, NULL, NULL},
-  {L"Reserved", 1, 63, L"%x", NULL, NULL, NULL, NULL},
+  { L"Interface Type",             1,   36, L"%d",       NULL,       NULL, NULL,                  NULL },
+  { L"Reserved",                   3,   37, L"%x %x %x", Dump3Chars, NULL, NULL,                  NULL },
+  { L"Base Address",               12,  40, NULL,        DumpGas,    NULL, NULL,                  NULL },
+  { L"Interrupt Type",             1,   52, L"%d",       NULL,       NULL, ValidateInterruptType, NULL },
+  { L"IRQ",                        1,   53, L"%d",       NULL,       NULL, ValidateIrq,           NULL },
+  { L"Global System Interrupt",    4,   54, L"0x%x",     NULL,       NULL, NULL,                  NULL },
+  { L"Baud Rate",                  1,   58, L"%d",       NULL,       NULL, NULL,                  NULL },
+  { L"Parity",                     1,   59, L"%d",       NULL,       NULL, NULL,                  NULL },
+  { L"Stop Bits",                  1,   60, L"%d",       NULL,       NULL, NULL,                  NULL },
+  { L"Flow Control",               1,   61, L"0x%x",     NULL,       NULL, NULL,                  NULL },
+  { L"Terminal Type",              1,   62, L"%d",       NULL,       NULL, NULL,                  NULL },
+  { L"Reserved",                   1,   63, L"%x",       NULL,       NULL, NULL,                  NULL },
 
-  {L"PCI Device ID", 2, 64, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PCI Vendor ID", 2, 66, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PCI Bus Number", 1, 68, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PCI Device Number", 1, 69, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PCI Function Number", 1, 70, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PCI Flags", 4, 71, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PCI Segment", 1, 75, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 4, 76, L"%x", NULL, NULL, NULL, NULL}
+  { L"PCI Device ID",              2,   64, L"0x%x",     NULL,       NULL, NULL,                  NULL },
+  { L"PCI Vendor ID",              2,   66, L"0x%x",     NULL,       NULL, NULL,                  NULL },
+  { L"PCI Bus Number",             1,   68, L"0x%x",     NULL,       NULL, NULL,                  NULL },
+  { L"PCI Device Number",          1,   69, L"0x%x",     NULL,       NULL, NULL,                  NULL },
+  { L"PCI Function Number",        1,   70, L"0x%x",     NULL,       NULL, NULL,                  NULL },
+  { L"PCI Flags",                  4,   71, L"0x%x",     NULL,       NULL, NULL,                  NULL },
+  { L"PCI Segment",                1,   75, L"0x%x",     NULL,       NULL, NULL,                  NULL },
+  { L"Reserved",                   4,   76, L"%x",       NULL,       NULL, NULL,                  NULL }
 };
 
@@ -123 +126 @@
 EFIAPI
 ParseAcpiSpcr (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
   )
 {

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Srat/SratParser.c

@@ -17 +17 @@
 
 // Local Variables
-STATIC CONST UINT8* SratRAType;
-STATIC CONST UINT8* SratRALength;
-STATIC CONST UINT8* SratDeviceHandleType;
-STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
+STATIC CONST UINT8                   *SratRAType;
+STATIC CONST UINT8                   *SratRALength;
+STATIC CONST UINT8                   *SratDeviceHandleType;
+STATIC ACPI_DESCRIPTION_HEADER_INFO  AcpiHdrInfo;
 
 /**
@@ -33 +33 @@
 EFIAPI
 ValidateSratReserved (
-  IN UINT8* Ptr,
-  IN VOID*  Context
+  IN UINT8  *Ptr,
+  IN VOID   *Context
   )
 {
-  if (*(UINT32*)Ptr != 1) {
+  if (*(UINT32 *)Ptr != 1) {
     IncrementErrorCount ();
     Print (L"\nERROR: Reserved should be 1 for backward compatibility.\n");
@@ -55 +55 @@
 EFIAPI
 ValidateSratDeviceHandleType (
-  IN UINT8* Ptr,
-  IN VOID*  Context
+  IN UINT8  *Ptr,
+  IN VOID   *Context
   )
 {
-  UINT8   DeviceHandleType;
+  UINT8  DeviceHandleType;
 
   DeviceHandleType = *Ptr;
@@ -83 +83 @@
 EFIAPI
 DumpSratPciBdfNumber (
-  IN CONST CHAR16* Format,
-  IN UINT8*        Ptr
+  IN CONST CHAR16  *Format,
+  IN UINT8         *Ptr
   )
 {
-  CHAR16 Buffer[OUTPUT_FIELD_COLUMN_WIDTH];
+  CHAR16  Buffer[OUTPUT_FIELD_COLUMN_WIDTH];
 
   Print (L"\n");
@@ -144 +144 @@
   An ACPI_PARSER array describing the Device Handle - ACPI
 **/
-STATIC CONST ACPI_PARSER SratDeviceHandleAcpiParser[] = {
-  {L"ACPI_HID", 8, 0, L"0x%lx", NULL, NULL, NULL, NULL},
-  {L"ACPI_UID", 4, 8, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 4, 12, L"0x%x", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  SratDeviceHandleAcpiParser[] = {
+  { L"ACPI_HID", 8, 0,  L"0x%lx", NULL, NULL, NULL, NULL },
+  { L"ACPI_UID", 4, 8,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Reserved", 4, 12, L"0x%x",  NULL, NULL, NULL, NULL }
 };
 
@@ -153 +153 @@
   An ACPI_PARSER array describing the Device Handle - PCI
 **/
-STATIC CONST ACPI_PARSER SratDeviceHandlePciParser[] = {
-  {L"PCI Segment", 2, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"PCI BDF Number", 2, 2, NULL, DumpSratPciBdfNumber, NULL, NULL, NULL},
-  {L"Reserved", 12, 4, L"%x %x %x %x - %x %x %x %x - %x %x %x %x", Dump12Chars,
-   NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  SratDeviceHandlePciParser[] = {
+  { L"PCI Segment",    2,  0, L"0x%x",                                    NULL,                 NULL, NULL, NULL },
+  { L"PCI BDF Number", 2,  2, NULL,                                       DumpSratPciBdfNumber, NULL, NULL, NULL },
+  { L"Reserved",       12, 4, L"%x %x %x %x - %x %x %x %x - %x %x %x %x", Dump12Chars,
+    NULL, NULL, NULL }
 };
 
@@ -171 +171 @@
 EFIAPI
 DumpSratDeviceHandle (
-  IN CONST CHAR16* Format,
-  IN UINT8*        Ptr
- )
+  IN CONST CHAR16  *Format,
+  IN UINT8         *Ptr
+  )
 {
   if (SratDeviceHandleType == NULL) {
@@ -214 +214 @@
 EFIAPI
 DumpSratApicProximity (
- IN CONST CHAR16* Format,
- IN UINT8*        Ptr
- )
+  IN CONST CHAR16  *Format,
+  IN UINT8         *Ptr
+  )
 {
-  UINT32 ProximityDomain;
+  UINT32  ProximityDomain;
 
   ProximityDomain = Ptr[0] | (Ptr[1] << 8) | (Ptr[2] << 16);
@@ -228 +228 @@
   An ACPI_PARSER array describing the SRAT Table.
 **/
-STATIC CONST ACPI_PARSER SratParser[] = {
+STATIC CONST ACPI_PARSER  SratParser[] = {
   PARSE_ACPI_HEADER (&AcpiHdrInfo),
-  {L"Reserved", 4, 36, L"0x%x", NULL, NULL, ValidateSratReserved, NULL},
-  {L"Reserved", 8, 40, L"0x%lx", NULL, NULL, NULL, NULL}
+  { L"Reserved",                   4,  36, L"0x%x",  NULL, NULL, ValidateSratReserved, NULL },
+  { L"Reserved",                   8,  40, L"0x%lx", NULL, NULL, NULL,                 NULL }
 };
 
@@ -237 +237 @@
   An ACPI_PARSER array describing the Resource Allocation structure header.
 **/
-STATIC CONST ACPI_PARSER SratResourceAllocationParser[] = {
-  {L"Type", 1, 0, NULL, NULL, (VOID**)&SratRAType, NULL, NULL},
-  {L"Length", 1, 1, NULL, NULL, (VOID**)&SratRALength, NULL, NULL}
+STATIC CONST ACPI_PARSER  SratResourceAllocationParser[] = {
+  { L"Type",   1, 0, NULL, NULL, (VOID **)&SratRAType,   NULL, NULL },
+  { L"Length", 1, 1, NULL, NULL, (VOID **)&SratRALength, NULL, NULL }
 };
 
@@ -245 +245 @@
   An ACPI_PARSER array describing the GICC Affinity structure.
 **/
-STATIC CONST ACPI_PARSER SratGicCAffinityParser[] = {
-  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 1, 1, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"Proximity Domain", 4, 2, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"ACPI Processor UID", 4, 6, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Flags", 4, 10, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Clock Domain", 4, 14, L"0x%x", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  SratGicCAffinityParser[] = {
+  { L"Type",               1, 0,  L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Length",             1, 1,  L"0x%x", NULL, NULL, NULL, NULL },
+
+  { L"Proximity Domain",   4, 2,  L"0x%x", NULL, NULL, NULL, NULL },
+  { L"ACPI Processor UID", 4, 6,  L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Flags",              4, 10, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Clock Domain",       4, 14, L"0x%x", NULL, NULL, NULL, NULL }
 };
 
@@ -258 +258 @@
   An ACPI_PARSER array describing the GIC ITS Affinity structure.
 **/
-STATIC CONST ACPI_PARSER SratGicITSAffinityParser[] = {
-  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 1, 1, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"Proximity Domain", 4, 2, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 2, 6, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"ITS Id", 4, 8, L"0x%x", NULL, NULL, NULL, NULL},
+STATIC CONST ACPI_PARSER  SratGicITSAffinityParser[] = {
+  { L"Type",             1, 0, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Length",           1, 1, L"0x%x", NULL, NULL, NULL, NULL },
+
+  { L"Proximity Domain", 4, 2, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Reserved",         2, 6, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"ITS Id",           4, 8, L"0x%x", NULL, NULL, NULL, NULL },
 };
 
@@ -270 +270 @@
   An ACPI_PARSER array describing the Generic Initiator Affinity Structure
 **/
-STATIC CONST ACPI_PARSER SratGenericInitiatorAffinityParser[] = {
-  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 1, 1, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"Reserved", 1, 2, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Device Handle Type", 1, 3, L"%d", NULL, (VOID**)&SratDeviceHandleType,
-   ValidateSratDeviceHandleType, NULL},
-  {L"Proximity Domain", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Device Handle", 16, 8, L"%s", DumpSratDeviceHandle, NULL, NULL, NULL},
-  {L"Flags", 4, 24, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 4, 28, L"0x%x", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  SratGenericInitiatorAffinityParser[] = {
+  { L"Type",               1,  0,  L"0x%x", NULL,                 NULL,                           NULL, NULL },
+  { L"Length",             1,  1,  L"0x%x", NULL,                 NULL,                           NULL, NULL },
+
+  { L"Reserved",           1,  2,  L"0x%x", NULL,                 NULL,                           NULL, NULL },
+  { L"Device Handle Type", 1,  3,  L"%d",   NULL,                 (VOID **)&SratDeviceHandleType,
+    ValidateSratDeviceHandleType, NULL },
+  { L"Proximity Domain",   4,  4,  L"0x%x", NULL,                 NULL,                           NULL, NULL },
+  { L"Device Handle",      16, 8,  L"%s",   DumpSratDeviceHandle, NULL,                           NULL, NULL },
+  { L"Flags",              4,  24, L"0x%x", NULL,                 NULL,                           NULL, NULL },
+  { L"Reserved",           4,  28, L"0x%x", NULL,                 NULL,                           NULL, NULL }
 };
 
@@ -286 +286 @@
   An ACPI_PARSER array describing the Memory Affinity structure.
 **/
-STATIC CONST ACPI_PARSER SratMemAffinityParser[] = {
-  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 1, 1, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"Proximity Domain", 4, 2, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 2, 6, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Base Address Low", 4, 8, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Base Address High", 4, 12, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length Low", 4, 16, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length High", 4, 20, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 4, 24, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Flags", 4, 28, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 8, 32, L"0x%lx", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  SratMemAffinityParser[] = {
+  { L"Type",              1, 0,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Length",            1, 1,  L"0x%x",  NULL, NULL, NULL, NULL },
+
+  { L"Proximity Domain",  4, 2,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Reserved",          2, 6,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Base Address Low",  4, 8,  L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Base Address High", 4, 12, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Length Low",        4, 16, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Length High",       4, 20, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Reserved",          4, 24, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Flags",             4, 28, L"0x%x",  NULL, NULL, NULL, NULL },
+  { L"Reserved",          8, 32, L"0x%lx", NULL, NULL, NULL, NULL }
 };
 
@@ -304 +304 @@
   An ACPI_PARSER array describing the APIC/SAPIC Affinity structure.
 **/
-STATIC CONST ACPI_PARSER SratApciSapicAffinityParser[] = {
-  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 1, 1, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"Proximity Domain [7:0]", 1, 2, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"APIC ID", 1, 3, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Flags", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Local SAPIC EID", 1, 8, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Proximity Domain [31:8]", 3, 9, L"0x%x", DumpSratApicProximity,
-   NULL, NULL, NULL},
-  {L"Clock Domain", 4, 12, L"0x%x", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  SratApciSapicAffinityParser[] = {
+  { L"Type",                    1, 0,  L"0x%x", NULL,                  NULL, NULL, NULL },
+  { L"Length",                  1, 1,  L"0x%x", NULL,                  NULL, NULL, NULL },
+
+  { L"Proximity Domain [7:0]",  1, 2,  L"0x%x", NULL,                  NULL, NULL, NULL },
+  { L"APIC ID",                 1, 3,  L"0x%x", NULL,                  NULL, NULL, NULL },
+  { L"Flags",                   4, 4,  L"0x%x", NULL,                  NULL, NULL, NULL },
+  { L"Local SAPIC EID",         1, 8,  L"0x%x", NULL,                  NULL, NULL, NULL },
+  { L"Proximity Domain [31:8]", 3, 9,  L"0x%x", DumpSratApicProximity,
+    NULL, NULL, NULL },
+  { L"Clock Domain",            4, 12, L"0x%x", NULL,                  NULL, NULL, NULL }
 };
 
@@ -320 +320 @@
   An ACPI_PARSER array describing the Processor Local x2APIC Affinity structure.
 **/
-STATIC CONST ACPI_PARSER SratX2ApciAffinityParser[] = {
-  {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Length", 1, 1, L"0x%x", NULL, NULL, NULL, NULL},
-
-  {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Proximity Domain", 4, 4, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"X2APIC ID", 4, 8, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Flags", 4, 12, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Clock Domain", 4, 16, L"0x%x", NULL, NULL, NULL, NULL},
-  {L"Reserved", 4, 20, L"0x%x", NULL, NULL, NULL, NULL}
+STATIC CONST ACPI_PARSER  SratX2ApciAffinityParser[] = {
+  { L"Type",             1, 0,  L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Length",           1, 1,  L"0x%x", NULL, NULL, NULL, NULL },
+
+  { L"Reserved",         2, 2,  L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Proximity Domain", 4, 4,  L"0x%x", NULL, NULL, NULL, NULL },
+  { L"X2APIC ID",        4, 8,  L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Flags",            4, 12, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Clock Domain",     4, 16, L"0x%x", NULL, NULL, NULL, NULL },
+  { L"Reserved",         4, 20, L"0x%x", NULL, NULL, NULL, NULL }
 };
 
@@ -353 +353 @@
 EFIAPI
 ParseAcpiSrat (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
   )
 {
-  UINT32 Offset;
-  UINT8* ResourcePtr;
-  UINT32 GicCAffinityIndex;
-  UINT32 GicITSAffinityIndex;
-  UINT32 GenericInitiatorAffinityIndex;
-  UINT32 MemoryAffinityIndex;
-  UINT32 ApicSapicAffinityIndex;
-  UINT32 X2ApicAffinityIndex;
-  CHAR8  Buffer[80];  // Used for AsciiName param of ParseAcpi
-
-  GicCAffinityIndex = 0;
-  GicITSAffinityIndex = 0;
+  UINT32  Offset;
+  UINT8   *ResourcePtr;
+  UINT32  GicCAffinityIndex;
+  UINT32  GicITSAffinityIndex;
+  UINT32  GenericInitiatorAffinityIndex;
+  UINT32  MemoryAffinityIndex;
+  UINT32  ApicSapicAffinityIndex;
+  UINT32  X2ApicAffinityIndex;
+  CHAR8   Buffer[80]; // Used for AsciiName param of ParseAcpi
+
+  GicCAffinityIndex             = 0;
+  GicITSAffinityIndex           = 0;
   GenericInitiatorAffinityIndex = 0;
-  MemoryAffinityIndex = 0;
-  ApicSapicAffinityIndex = 0;
-  X2ApicAffinityIndex = 0;
+  MemoryAffinityIndex           = 0;
+  ApicSapicAffinityIndex        = 0;
+  X2ApicAffinityIndex           = 0;
 
   if (!Trace) {
@@ -404 +404 @@
     // successfully read.
     if ((SratRAType == NULL) ||
-        (SratRALength == NULL)) {
+        (SratRALength == NULL))
+    {
       IncrementErrorCount ();
       Print (
         L"ERROR: Insufficient remaining table buffer length to read the " \
-          L"Static Resource Allocation structure header. Length = %d.\n",
+        L"Static Resource Allocation structure header. Length = %d.\n",
         AcpiTableLength - Offset
         );
@@ -416 +417 @@
     // Validate Static Resource Allocation Structure length
     if ((*SratRALength == 0) ||
-        ((Offset + (*SratRALength)) > AcpiTableLength)) {
+        ((Offset + (*SratRALength)) > AcpiTableLength))
+    {
       IncrementErrorCount ();
       Print (
         L"ERROR: Invalid Static Resource Allocation Structure length. " \
-          L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
+        L"Length = %d. Offset = %d. AcpiTableLength = %d.\n",
         *SratRALength,
         Offset,
@@ -452 +454 @@
           "GIC ITS Affinity Structure [%d]",
           GicITSAffinityIndex++
-        );
+          );
         ParseAcpi (
           TRUE,
@@ -469 +471 @@
           "Generic Initiator Affinity Structure [%d]",
           GenericInitiatorAffinityIndex++
-        );
+          );
         ParseAcpi (
           TRUE,
@@ -477 +479 @@
           *SratRALength,
           PARSER_PARAMS (SratGenericInitiatorAffinityParser)
-        );
+          );
         break;
 
@@ -538 +540 @@
 
     ResourcePtr += (*SratRALength);
-    Offset += (*SratRALength);
+    Offset      += (*SratRALength);
   }
 }

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Ssdt/SsdtParser.c

@@ -29 +29 @@
 EFIAPI
 ParseAcpiSsdt (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
   )
 {

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c

@@ -16 +16 @@
 
 // Local variables
-STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
+STATIC ACPI_DESCRIPTION_HEADER_INFO  AcpiHdrInfo;
 
 /** An ACPI_PARSER array describing the ACPI XSDT table.
 */
-STATIC CONST ACPI_PARSER XsdtParser[] = {
+STATIC CONST ACPI_PARSER  XsdtParser[] = {
   PARSE_ACPI_HEADER (&AcpiHdrInfo)
 };
@@ -31 +31 @@
 GetAcpiXsdtHeaderInfo (
   VOID
-)
+  )
 {
   return &AcpiHdrInfo;
@@ -49 +49 @@
 EFIAPI
 ParseAcpiXsdt (
-  IN BOOLEAN Trace,
-  IN UINT8*  Ptr,
-  IN UINT32  AcpiTableLength,
-  IN UINT8   AcpiTableRevision
+  IN BOOLEAN  Trace,
+  IN UINT8    *Ptr,
+  IN UINT32   AcpiTableLength,
+  IN UINT8    AcpiTableRevision
   )
 {
-  UINT32        Offset;
-  UINT32        TableOffset;
-  UINT64*       TablePointer;
-  UINTN         EntryIndex;
-  CHAR16        Buffer[32];
+  UINT32  Offset;
+  UINT32  TableOffset;
+  UINT64  *TablePointer;
+  UINTN   EntryIndex;
+  CHAR16  Buffer[32];
 
   Offset = ParseAcpi (
@@ -73 +73 @@
 
   if (Trace) {
-    EntryIndex = 0;
-    TablePointer = (UINT64*)(Ptr + TableOffset);
+    EntryIndex   = 0;
+    TablePointer = (UINT64 *)(Ptr + TableOffset);
     while (Offset < AcpiTableLength) {
-      CONST UINT32* Signature;
-      CONST UINT32* Length;
-      CONST UINT8*  Revision;
+      CONST UINT32  *Signature;
+      CONST UINT32  *Length;
+      CONST UINT8   *Revision;
 
-      if ((UINT64*)(UINTN)(*TablePointer) != NULL) {
-        UINT8*      SignaturePtr;
+      if ((UINT64 *)(UINTN)(*TablePointer) != NULL) {
+        UINT8  *SignaturePtr;
 
         ParseAcpiHeader (
-          (UINT8*)(UINTN)(*TablePointer),
+          (UINT8 *)(UINTN)(*TablePointer),
           &Signature,
           &Length,
@@ -90 +90 @@
           );
 
-        SignaturePtr = (UINT8*)Signature;
+        SignaturePtr = (UINT8 *)Signature;
 
         UnicodeSPrint (
@@ -115 +115 @@
 
       // Validate the table pointers are not NULL
-      if ((UINT64*)(UINTN)(*TablePointer) == NULL) {
+      if ((UINT64 *)(UINTN)(*TablePointer) == NULL) {
         IncrementErrorCount ();
         Print (
@@ -123 +123 @@
           );
       }
+
       Offset += sizeof (UINT64);
       TablePointer++;
@@ -129 +130 @@
 
   // Process the tables
-  Offset = TableOffset;
-  TablePointer = (UINT64*)(Ptr + TableOffset);
+  Offset       = TableOffset;
+  TablePointer = (UINT64 *)(Ptr + TableOffset);
   while (Offset < AcpiTableLength) {
-    if ((UINT64*)(UINTN)(*TablePointer) != NULL) {
-      ProcessAcpiTable ((UINT8*)(UINTN)(*TablePointer));
+    if ((UINT64 *)(UINTN)(*TablePointer) != NULL) {
+      ProcessAcpiTable ((UINT8 *)(UINTN)(*TablePointer));
     }
+
     Offset += sizeof (UINT64);
     TablePointer++;