ShellPkg: acpiview: Check if SBBR mandatory ACPI tables are installed

For Arm-based platforms, count the instances of installed tables for
each ACPI table listed as 'mandatory' in any Server Base Boot
Requirements (SBBR) specification.

Validate that the all the mandatory SBBR tables present. Report an error
for each missing table.

This new feature is optional and can be enabled with the -r command line
parameter.

Reference(s):
    - Arm Server Base Boot Requirements 1.2, September 2019
    - Arm Server Base Boot Requirements 1.1, May 2018
    - Arm Server Base Boot Requirements 1.0, March 2016

Signed-off-by: Krzysztof Koch <krzysztof.koch@arm.com>
Reviewed-by: Sami Mujawar <Sami.Mujawar@arm.com>
Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.c
index 501967c4dde680809c56e5d79ed744a1013a69e1..d5b9eee5232399c4df50d0f9598810413759fed6 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.c
@@ -3,6 +3,12 @@
 \r
   Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
+\r
+  @par Glossary:\r
+    - Sbbr or SBBR   - Server Base Boot Requirements\r
+\r
+  @par Reference(s):\r
+    - Arm Server Base Boot Requirements 1.2, September 2019\r
 **/\r
 \r
 #include <Uefi.h>\r
@@ -12,6 +18,10 @@
 #include "AcpiTableParser.h"\r
 #include "AcpiView.h"\r
 \r
+#if defined(MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)\r
+#include "Arm/SbbrValidator.h"\r
+#endif\r
+\r
 /**\r
   A list of registered ACPI table parsers.\r
 **/\r
@@ -216,6 +226,12 @@ ProcessAcpiTable (
     }\r
   }\r
 \r
+#if defined(MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)\r
+  if (GetMandatoryTableValidate ()) {\r
+    ArmSbbrIncrementTableCount (*AcpiTableSignature);\r
+  }\r
+#endif\r
+\r
   Status = GetParser (*AcpiTableSignature, &ParserProc);\r
   if (EFI_ERROR (Status)) {\r
     // No registered parser found, do default handling.\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
index 49c2e87c430d7fb57793f6405ebee91cb8f6cbaa..84ffb3595750a3e7d65fdb82c0f90bc2d76c659e 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
@@ -2,6 +2,12 @@
 \r
   Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
+\r
+  @par Glossary:\r
+    - Sbbr or SBBR   - Server Base Boot Requirements\r
+\r
+  @par Reference(s):\r
+    - Arm Server Base Boot Requirements 1.2, September 2019\r
 **/\r
 \r
 #include <Library/PrintLib.h>\r
@@ -16,6 +22,10 @@
 #include "AcpiView.h"\r
 #include "UefiShellAcpiViewCommandLib.h"\r
 \r
+#if defined(MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)\r
+#include "Arm/SbbrValidator.h"\r
+#endif\r
+\r
 EFI_HII_HANDLE gShellAcpiViewHiiHandle = NULL;\r
 \r
 // Report variables\r
@@ -438,6 +448,12 @@ AcpiView (
       return EFI_UNSUPPORTED;\r
     }\r
 \r
+#if defined(MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)\r
+    if (GetMandatoryTableValidate ()) {\r
+      ArmSbbrResetTableCounts ();\r
+    }\r
+#endif\r
+\r
     // The RSDP length is 4 bytes starting at offset 20\r
     RsdpLength = *(UINT32*)(RsdpPtr + RSDP_LENGTH_OFFSET);\r
 \r
@@ -466,6 +482,12 @@ AcpiView (
     return EFI_NOT_FOUND;\r
   }\r
 \r
+#if defined(MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)\r
+  if (GetMandatoryTableValidate ()) {\r
+    ArmSbbrReqsValidate ((ARM_SBBR_VERSION)GetMandatoryTableSpec ());\r
+  }\r
+#endif\r
+\r
   ReportOption = GetReportOption ();\r
   if (ReportTableList != ReportOption) {\r
     if (((ReportSelected == ReportOption)  ||\r