From: "Tomas Pilar (tpilar)" <Tomas.Pilar@arm.com>
To: <devel@edk2.groups.io>
Cc: Ray Ni <ray.ni@intel.com>, Zhichao Gao <zhichao.gao@intel.com>
Subject: [PATCH v1 6/6] ShellPkg/AcpiView: Add application wrapper
Date: Thu, 21 May 2020 19:16:29 +0100 [thread overview]
Message-ID: <20200521181629.79-7-Tomas.Pilar@arm.com> (raw)
In-Reply-To: <20200521181629.79-1-Tomas.Pilar@arm.com>
Simple application wrapper that invokes the shell
command wrapper for acpiview.
This allows the AcpiView functionality to be used
on platforms with older specifications of the UEFI
shell or where the 'acpiview' command is not built in
due to platform build configuration.
Furthermore, this app can be integrated into more comprehensive
testing frameworks as a single component of a more thorough
specification compliance validation strategy.
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Signed-off-by: Tomas Pilar <tomas.pilar@arm.com>
---
ShellPkg/Application/AcpiViewApp/AcpiViewApp.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
ShellPkg/Application/AcpiViewApp/AcpiViewApp.inf | 31 ++++++++++++
ShellPkg/ShellPkg.dsc | 6 ++-
3 files changed, 225 insertions(+), 1 deletion(-)
diff --git a/ShellPkg/Application/AcpiViewApp/AcpiViewApp.c b/ShellPkg/Application/AcpiViewApp/AcpiViewApp.c
new file mode 100644
index 000000000000..f83111629c21
--- /dev/null
+++ b/ShellPkg/Application/AcpiViewApp/AcpiViewApp.c
@@ -0,0 +1,189 @@
+/** @file
+ Main file for AcpiViewApp application
+
+ Copyright (c) 2020, ARM Limited. All rights reserved.<BR>
+ SPDX-License-Identifier: BSD-2-Clause-Patent
+**/
+
+#include <Library/BaseLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiLib.h>
+
+#include <Protocol/ShellParameters.h>
+
+/**
+ Execute the AcpiView command from UefiShellAcpiViewCommandLib.
+ This function is pulled in directly from the library source.
+**/
+SHELL_STATUS
+EFIAPI
+ShellCommandRunAcpiView (
+ IN EFI_HANDLE ImageHandle,
+ IN EFI_SYSTEM_TABLE* SystemTable
+ );
+
+CHAR16 mAcpiViewAppHelp[] =
+ u"\r\n"
+ "Display ACPI Table information.\r\n"
+ "\r\n"
+ "AcpiViewApp.efi [[-?] | [[-l] | [-s AcpiTable [-d]]] [-q] [-h]]\r\n"
+ " \r\n"
+ " -l - Display list of installed ACPI Tables.\r\n"
+ " -s - Display only the specified AcpiTable type and only support single\r\n"
+ " invocation option.\r\n"
+ " AcpiTable : The required ACPI Table type.\r\n"
+ " -d - Generate a binary file dump of the specified AcpiTable.\r\n"
+ " -q - Quiet. Suppress errors and warnings. Disables consistency checks.\r\n"
+ " -h - Enable colour highlighting.\r\n"
+ " -? - Show help.\r\n"
+ " \r\n"
+ " This program is provided to allow examination of ACPI table values from "
+ "the\r\n"
+ " UEFI Shell. This can help with investigations, especially at that "
+ "stage\r\n"
+ " where the tables are not enabling an OS to boot.\r\n"
+ " The program is not exhaustive, and only encapsulates detailed knowledge "
+ "of a\r\n"
+ " limited number of table types.\r\n"
+ " \r\n"
+ " Default behaviour is to display the content of all tables installed.\r\n"
+ " 'Known' table types (listed in NOTES below) will be parsed and "
+ "displayed\r\n"
+ " with descriptions and field values. Where appropriate a degree of\r\n"
+ " consistency checking is done and errors may be reported in the output.\r\n"
+ " Other table types will be displayed as an array of Hexadecimal bytes.\r\n"
+ " \r\n"
+ " To facilitate debugging, the -s and -d options can be used to generate "
+ "a\r\n"
+ " binary file image of a table that can be copied elsewhere for "
+ "investigation\r\n"
+ " using tools such as those provided by acpica.org. This is especially\r\n"
+ " relevant for AML type tables like DSDT and SSDT.\r\n"
+ " \r\n"
+ "NOTES:\r\n"
+ " 1. The AcpiTable parameter can match any installed table type.\r\n"
+ " Tables without specific handling will be displayed as a raw hex dump "
+ "(or\r\n"
+ " dumped to a file if -d is used).\r\n"
+ " 2. -s option supports to display the specified AcpiTable type that is "
+ "present\r\n"
+ " in the system. For normal type AcpiTable, it would display the data of "
+ "the\r\n"
+ " AcpiTable and AcpiTable header. The following type may contain header "
+ "type\r\n"
+ " other than AcpiTable header. The actual header can refer to the ACPI "
+ "spec\r\n"
+ " 6.3\r\n"
+ " Extra A. Particular types:\r\n"
+ " APIC - Multiple APIC Description Table (MADT)\r\n"
+ " BGRT - Boot Graphics Resource Table\r\n"
+ " DBG2 - Debug Port Table 2\r\n"
+ " DSDT - Differentiated System Description Table\r\n"
+ " FACP - Fixed ACPI Description Table (FADT)\r\n"
+ " GTDT - Generic Timer Description Table\r\n"
+ " IORT - IO Remapping Table\r\n"
+ " MCFG - Memory Mapped Config Space Base Address Description Table\r\n"
+ " PPTT - Processor Properties Topology Table\r\n"
+ " RSDP - Root System Description Pointer\r\n"
+ " SLIT - System Locality Information Table\r\n"
+ " SPCR - Serial Port Console Redirection Table\r\n"
+ " SRAT - System Resource Affinity Table\r\n"
+ " SSDT - Secondary SystemDescription Table\r\n"
+ " XSDT - Extended System Description Table\r\n"
+ " \r\n"
+ " Table details correspond to those in 'Advanced Configuration and Power\r\n"
+ " Interface Specification' Version 6.3 [January 2019]\r\n"
+ " (https://uefi.org/specifications)\r\n"
+ " "
+ " \r\n"
+ " NOTE: The nature of the ACPI standard means that almost all tables in "
+ "6.1\r\n"
+ " will be 'backwards compatible' with prior version of the "
+ "specification\r\n"
+ " in terms of structure, so formatted output should be correct. The "
+ "main\r\n"
+ " exception will be that previously 'reserved' fields will be "
+ "reported\r\n"
+ " with new names, where they have been added in later versions of "
+ "the\r\n"
+ " specification.\r\n"
+ " \r\n"
+ " \r\n"
+ "EXAMPLES:\r\n"
+ " * To display a list of the installed table types:\r\n"
+ " fs0:\\> AcpiViewApp.efi -l\r\n"
+ " \r\n"
+ " * To parse and display a specific table type:\r\n"
+ " fs0:\\> AcpiViewApp.efi -s GTDT\r\n"
+ " \r\n"
+ " * To save a binary dump of the contents of a table to a file\r\n"
+ " in the current working directory:\r\n"
+ " fs0:\\> AcpiViewApp.efi -s DSDT -d\r\n"
+ " \r\n"
+ " * To display contents of all ACPI tables:\r\n"
+ " fs0:\\> AcpiViewApp.efi\r\n"
+ " \r\n";
+
+/**
+ Determine if the user wants to display by checking for presence
+ of '/?' or '--help' on command line. We cannot override '-?' shell
+ command line handling.
+
+ @retval EFI_SUCCESS No help was printed
+ @retval EFI_INVALID_PARAMETER Help was printed
+**/
+STATIC
+EFI_STATUS
+CheckForHelpRequest (
+ EFI_HANDLE ImageHandle
+ )
+{
+ EFI_STATUS Status;
+ EFI_SHELL_PARAMETERS_PROTOCOL *ShellParameters;
+ UINTN Index;
+
+ Status = gBS->HandleProtocol (
+ ImageHandle,
+ &gEfiShellParametersProtocolGuid,
+ (VOID **)&ShellParameters
+ );
+ if (EFI_ERROR(Status)) {
+ return Status;
+ }
+
+ for (Index = 1; Index < ShellParameters->Argc; Index++) {
+ if ((StrCmp (ShellParameters->Argv[Index], L"/?") == 0) ||
+ (StrCmp (ShellParameters->Argv[Index], L"--help") == 0)) {
+ Print (mAcpiViewAppHelp);
+ return EFI_INVALID_PARAMETER;
+ }
+ }
+
+ return EFI_SUCCESS;
+}
+
+
+/**
+ Application Entry Point wrapper around the shell command
+
+ @param[in] ImageHandle Handle to the Image (NULL if internal).
+ @param[in] SystemTable Pointer to the System Table (NULL if internal).
+**/
+EFI_STATUS
+EFIAPI
+AcpiViewAppMain (
+ IN EFI_HANDLE ImageHandle,
+ IN EFI_SYSTEM_TABLE *SystemTable
+ )
+{
+ EFI_STATUS Status;
+
+ Status = CheckForHelpRequest (ImageHandle);
+
+ // Do not run code if help was printed
+ if (Status != EFI_INVALID_PARAMETER) {
+ Status = ShellCommandRunAcpiView (gImageHandle, SystemTable);
+ }
+
+ return Status;
+}
diff --git a/ShellPkg/Application/AcpiViewApp/AcpiViewApp.inf b/ShellPkg/Application/AcpiViewApp/AcpiViewApp.inf
new file mode 100644
index 000000000000..28e724fa1909
--- /dev/null
+++ b/ShellPkg/Application/AcpiViewApp/AcpiViewApp.inf
@@ -0,0 +1,31 @@
+## @file
+# EFI application that displays and verifies ACPI tables
+#
+# Copyright (c) 2020, ARM Limited. All rights reserved.<BR>
+#
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+#
+##
+
+[Defines]
+ INF_VERSION = 0x0001001B
+ BASE_NAME = AcpiViewApp
+ FILE_GUID = 46361B5B-AF17-41FF-95F9-E1BCE08435B9
+ MODULE_TYPE = UEFI_APPLICATION
+ VERSION_STRING = 1.0
+ ENTRY_POINT = AcpiViewAppMain
+
+[Sources.common]
+ AcpiViewApp.c
+
+[Packages]
+ MdeModulePkg/MdeModulePkg.dec
+ MdePkg/MdePkg.dec
+ ShellPkg/ShellPkg.dec
+
+[LibraryClasses]
+ UefiBootServicesTableLib
+ UefiLib
+ BaseLib
+ UefiApplicationEntryPoint
diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index b7ee856b3a16..1ed82ee7aca3 100644
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -2,7 +2,7 @@
# Shell Package
#
# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>
-# Copyright (c) 2018, Arm Limited. All rights reserved.<BR>
+# Copyright (c) 2018 - 2020, Arm Limited. All rights reserved.<BR>
# Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -143,6 +143,10 @@ [Components]
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
}
ShellPkg/DynamicCommand/DpDynamicCommand/DpApp.inf
+ ShellPkg/Application/AcpiViewApp/AcpiViewApp.inf {
+ <LibraryClasses>
+ NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf
+ }
[BuildOptions]
*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
--
2.24.1.windows.2
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
prev parent reply other threads:[~2020-05-21 18:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-21 18:16 [PATCH v1 0/6] Standalone AcpiView Application Tomas Pilar (tpilar)
2020-05-21 18:16 ` [PATCH v1 1/6] ShellPkg/AcpiView: Move log reset to main method Tomas Pilar (tpilar)
2020-05-21 18:16 ` [PATCH v1 2/6] ShellPkg/AcpiView: Refactor configuration Tomas Pilar (tpilar)
2020-05-21 18:16 ` [PATCH v1 3/6] ShellPkg/AcpiView: Move table count reset Tomas Pilar (tpilar)
2020-05-21 18:16 ` [PATCH v1 4/6] ShellPkg/AcpiView: Move parameter parsing Tomas Pilar (tpilar)
2020-05-21 18:23 ` [edk2-devel] " Tomas Pilar (tpilar)
2020-05-21 18:16 ` [PATCH v1 5/6] ShellPkg/AcpiView: Refactor DumpAcpiTableToFile Tomas Pilar (tpilar)
2020-05-21 18:16 ` Tomas Pilar (tpilar) [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200521181629.79-7-Tomas.Pilar@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox