ShellPkg/AcpiView: RAS2 Parser

Add a new parser for the RAS2 Table as specified in ACPI6.5

Signed-off-by: Carsten Haitzler <carsten.haitzler@foss.arm.com>

4 files changed, 143 insertions, 0 deletions

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h
index 6427ea7d8a..32816242fc 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.h
@@ -1007,6 +1007,29 @@ ParseAcpiPptt (
   );

 

 /**

+  This function parses the ACPI RAS2 table.

+  When trace is enabled this function parses the RAS2 table and

+  traces the ACPI table fields.

+

+  This function parses the RAS2 ACPI table along with PCC Entries

+

+  This function also performs validation of the ACPI table fields.

+

+  @param [in] Trace              If TRUE, trace the ACPI fields.

+  @param [in] Ptr                Pointer to the start of the buffer.

+  @param [in] AcpiTableLength    Length of the ACPI table.

+  @param [in] AcpiTableRevision  Revision of the ACPI table.

+**/

+VOID

+EFIAPI

+ParseAcpiRas2 (

+  IN BOOLEAN  Trace,

+  IN UINT8    *Ptr,

+  IN UINT32   AcpiTableLength,

+  IN UINT8    AcpiTableRevision

+  );

+

+/**

   This function parses the ACPI RSDP table.

 

   This function invokes the parser for the XSDT table.

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Ras2/Ras2Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Ras2/Ras2Parser.c
new file mode 100644
index 0000000000..9c61b96817
--- /dev/null
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Ras2/Ras2Parser.c
@@ -0,0 +1,118 @@
+/** @file

+  RAS2 table parser

+

+  Copyright (c) 2024, Arm Limited. All rights reserved.

+  SPDX-License-Identifier: BSD-2-Clause-Patent

+

+  @par Reference(s):

+    - ACPI 6.5 Specification - August 2022

+**/

+

+#include <Library/PrintLib.h>

+#include <Library/BaseLib.h>

+#include <Library/UefiLib.h>

+#include "AcpiParser.h"

+#include "AcpiView.h"

+

+// Maximum Memory Domain matrix print size.

+#define MAX_MEMORY_DOMAIN_TARGET_PRINT_MATRIX  10

+

+// Local variables

+STATIC CONST UINT16  *Ras2PccDescriptors;

+

+STATIC ACPI_DESCRIPTION_HEADER_INFO  AcpiHdrInfo;

+

+/**

+  An ACPI_PARSER array describing the ACPI RAS2 Table.

+*/

+STATIC CONST ACPI_PARSER  Ras2Parser[] = {

+  PARSE_ACPI_HEADER (&AcpiHdrInfo),

+  { L"Reserved",                   2,  36, L"0x%x", NULL, NULL,                         NULL, NULL },

+  { L"PCC Descriptors",            2,  38, L"%d",   NULL, (VOID **)&Ras2PccDescriptors, NULL, NULL }

+};

+

+/**

+  An ACPI_PARSER array describing the RAS2 PCC ID Entry

+*/

+STATIC CONST ACPI_PARSER  Ras2StructurePccDescriptor[] = {

+  { L"PCC ID",       1, 0, L"0x%x", NULL, NULL, NULL, NULL },

+  { L"Reserved",     1, 1, L"0x%x", NULL, NULL, NULL, NULL },

+  { L"Reserved",     1, 2, L"0x%x", NULL, NULL, NULL, NULL },

+  { L"Feature Type", 1, 3, L"0x%x", NULL, NULL, NULL, NULL },

+  { L"Instance",     4, 4, L"0x%x", NULL, NULL, NULL, NULL }

+};

+

+STATIC

+VOID

+DumpPccEntry (

+  IN UINT8   *Ptr,

+  IN UINT32  Length

+  )

+{

+  ParseAcpi (

+    TRUE,

+    2,

+    "PCC Descriptor Entry",

+    Ptr,

+    Length,

+    PARSER_PARAMS (Ras2StructurePccDescriptor)

+    );

+}

+

+/**

+  This function parses the ACPI RAS2 table.

+  When trace is enabled this function parses the RAS2 table and

+  traces the ACPI table fields.

+

+  This function parses the following RAS2 structures:

+    - Pcc Instries

+    - Entry Pcc ID

+    - Entry Feature Type

+    - Entry Pcc Instance

+

+  This function also performs validation of the ACPI table fields.

+

+  @param [in] Trace              If TRUE, trace the ACPI fields.

+  @param [in] Ptr                Pointer to the start of the buffer.

+  @param [in] AcpiTableLength    Length of the ACPI table.

+  @param [in] AcpiTableRevision  Revision of the ACPI table.

+**/

+VOID

+EFIAPI

+ParseAcpiRas2 (

+  IN BOOLEAN  Trace,

+  IN UINT8    *Ptr,

+  IN UINT32   AcpiTableLength,

+  IN UINT8    AcpiTableRevision

+  )

+{

+  UINT32  Offset;

+

+  if (!Trace) {

+    return;

+  }

+

+  // Parse ACPI Header + RAS2 "fixed" fields

+  Offset = ParseAcpi (

+             Trace,

+             0,

+             "RAS2",

+             Ptr,

+             AcpiTableLength,

+             PARSER_PARAMS (Ras2Parser)

+             );

+

+  // Table is too small to contain data

+  if (Offset >= AcpiTableLength) {

+    return;

+  }

+

+  // Loop over rest of table for PCC Entries and dump them

+  while (Offset <= (AcpiTableLength - sizeof (EFI_ACPI_RAS2_PCC_DESCRIPTOR))) {

+    DumpPccEntry (

+      Ptr + Offset,

+      sizeof (EFI_ACPI_RAS2_PCC_DESCRIPTOR)

+      );

+    Offset += sizeof (EFI_ACPI_RAS2_PCC_DESCRIPTOR);

+  } // while

+}

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
index 4f4254ac40..5e73a39095 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
@@ -71,6 +71,7 @@ ACPI_TABLE_PARSER  ParserList[] = {
     ParseAcpiPcct },

   { EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_SIGNATURE,

     ParseAcpiPptt },

+  { EFI_ACPI_6_5_ACPI_RAS2_FEATURE_TABLE_SIGNATURE,                                                      ParseAcpiRas2 },

   { RSDP_TABLE_INFO,                                                                                     ParseAcpiRsdp },

   { EFI_ACPI_6_2_SYSTEM_LOCALITY_INFORMATION_TABLE_SIGNATURE,                                            ParseAcpiSlit },

   { EFI_ACPI_6_2_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE,                                        ParseAcpiSpcr },

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf
index 54dddd0ee2..7ef8b0afb7 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf
@@ -50,6 +50,7 @@
   Parsers/Pcct/PcctParser.h

   Parsers/Pptt/PpttParser.c

   Parsers/Pptt/PpttParser.h

+  Parsers/Ras2/Ras2Parser.c

   Parsers/Rsdp/RsdpParser.c

   Parsers/Slit/SlitParser.c

   Parsers/Spcr/SpcrParser.c