From: "Sam Kaynor" <sam.kaynor@arm.com>
To: devel@edk2.groups.io
Cc: Sam Kaynor <Sam.Kaynor@arm.com>, Ray Ni <ray.ni@intel.com>,
Zhichao Gao <zhichao.gao@intel.com>
Subject: [PATCH v1 1/1] ShellPkg: UefiShellDebug1CommandsLib: Uefi Config Tables in Dmem.c
Date: Tue, 7 Feb 2023 15:19:57 -0600 [thread overview]
Message-ID: <20230207211957.62077-2-Sam.Kaynor@arm.com> (raw)
In-Reply-To: <20230207211957.62077-1-Sam.Kaynor@arm.com>
Added entries for UEFI Config Tables not present in current
Dmem output.
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Signed-off-by: Sam Kaynor <Sam.Kaynor@arm.com>
---
ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf | 9 ++
ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c | 89 ++++++++++++++++++--
ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni | 28 ++++--
3 files changed, 112 insertions(+), 14 deletions(-)
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
index 74ad5facf6b1..3741dac5d94c 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
@@ -121,6 +121,7 @@ [Protocols]
gEfiBlockIoProtocolGuid ## SOMETIMES_CONSUMES
gEfiSimplePointerProtocolGuid ## SOMETIMES_CONSUMES
gEfiCpuIo2ProtocolGuid ## SOMETIMES_CONSUMES
+ gEfiHiiDatabaseProtocolGuid ## SOMETIMES_CONSUMES
[Guids]
gEfiGlobalVariableGuid ## SOMETIMES_CONSUMES ## GUID
@@ -130,3 +131,11 @@ [Guids]
gEfiAcpi10TableGuid ## SOMETIMES_CONSUMES ## SystemTable
gEfiAcpi20TableGuid ## SOMETIMES_CONSUMES ## SystemTable
gShellDebug1HiiGuid ## SOMETIMES_CONSUMES ## HII
+ gEfiMemoryAttributesTableGuid ## SOMETIMES_CONSUMES ## SystemTable
+ gEfiRtPropertiesTableGuid ## SOMETIMES_CONSUMES ## SystemTable
+ gEfiSystemResourceTableGuid ## SOMETIMES_CONSUMES ## SystemTable
+ gEfiDebugImageInfoTableGuid ## SOMETIMES_CONSUMES ## SystemTable
+ gEfiImageSecurityDatabaseGuid ## SOMETIMES_CONSUMES ## SystemTable
+ gEfiJsonConfigDataTableGuid ## SOMETIMES_CONSUMES ## SystemTable
+ gEfiJsonCapsuleDataTableGuid ## SOMETIMES_CONSUMES ## SystemTable
+ gEfiJsonCapsuleResultTableGuid ## SOMETIMES_CONSUMES ## SystemTable
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
index c52c212a56f8..e2aed306d466 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
@@ -10,9 +10,16 @@
#include "UefiShellDebug1CommandsLib.h"
#include <Protocol/PciRootBridgeIo.h>
+#include <Protocol/HiiDatabase.h>
#include <Guid/Acpi.h>
#include <Guid/Mps.h>
#include <Guid/SmBios.h>
+#include <Guid/MemoryAttributesTable.h>
+#include <Guid/RtPropertiesTable.h>
+#include <Guid/SystemResourceTable.h>
+#include <Guid/DebugImageInfoTable.h>
+#include <Guid/ImageAuthentication.h>
+#include <Guid/JsonCapsule.h>
/**
Make a printable character.
@@ -108,6 +115,18 @@ ShellCommandRunDmem (
UINT64 SalTableAddress;
UINT64 SmbiosTableAddress;
UINT64 MpsTableAddress;
+ UINT64 DtbTableAddress;
+ UINT64 MemoryAttributesTableAddress;
+ UINT64 RtPropertiesTableAddress;
+ UINT64 SystemResourceTableAddress;
+ UINT64 DebugImageInfoTableAddress;
+ UINT64 ImageExecutionTableAddress;
+ UINT64 JsonConfigDataTableAddress;
+ UINT64 JsonCapsuleDataTableAddress;
+ UINT64 JsonCapsuleResultTableAddress;
+ UINT64 MemoryRangeCapsuleAddress;
+ UINT64 HiiDatabaseExportBufferAddress;
+ UINT64 ConformanceProfileTableAddress;
UINTN TableWalker;
ShellStatus = SHELL_SUCCESS;
@@ -168,11 +187,23 @@ ShellCommandRunDmem (
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DMEM_HEADER_ROW), gShellDebug1HiiHandle, (UINT64)(UINTN)Address, Size);
DumpHex (2, (UINTN)Address, (UINTN)Size, Address);
if (Address == (VOID *)gST) {
- Acpi20TableAddress = 0;
- AcpiTableAddress = 0;
- SalTableAddress = 0;
- SmbiosTableAddress = 0;
- MpsTableAddress = 0;
+ Acpi20TableAddress = 0;
+ AcpiTableAddress = 0;
+ SalTableAddress = 0;
+ SmbiosTableAddress = 0;
+ MpsTableAddress = 0;
+ DtbTableAddress = 0;
+ MemoryAttributesTableAddress = 0;
+ RtPropertiesTableAddress = 0;
+ SystemResourceTableAddress = 0;
+ DebugImageInfoTableAddress = 0;
+ ImageExecutionTableAddress = 0;
+ JsonConfigDataTableAddress = 0;
+ JsonCapsuleDataTableAddress = 0;
+ JsonCapsuleResultTableAddress = 0;
+ MemoryRangeCapsuleAddress = 0;
+ HiiDatabaseExportBufferAddress = 0;
+ ConformanceProfileTableAddress = 0;
for (TableWalker = 0; TableWalker < gST->NumberOfTableEntries; TableWalker++) {
if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiAcpi20TableGuid)) {
Acpi20TableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
@@ -193,11 +224,43 @@ ShellCommandRunDmem (
SmbiosTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
continue;
}
-
if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiMpsTableGuid)) {
MpsTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
continue;
}
+ if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiMemoryAttributesTableGuid)) {
+ MemoryAttributesTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
+ continue;
+ }
+ if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiRtPropertiesTableGuid)) {
+ RtPropertiesTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
+ continue;
+ }
+ if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiSystemResourceTableGuid)) {
+ SystemResourceTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
+ continue;
+ }
+ if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiDebugImageInfoTableGuid)) {
+ DebugImageInfoTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
+ continue;
+ }
+ if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiImageSecurityDatabaseGuid)) {
+ ImageExecutionTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
+ }
+ if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiJsonConfigDataTableGuid)) {
+ JsonConfigDataTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
+ continue;
+ }
+ if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiJsonCapsuleDataTableGuid)) {
+ JsonCapsuleDataTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
+ continue;
+ }
+ if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiJsonCapsuleResultTableGuid)) {
+ JsonCapsuleResultTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
+ }
+ if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiHiiDatabaseProtocolGuid)) {
+ HiiDatabaseExportBufferAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
+ }
}
ShellPrintHiiEx (
@@ -218,7 +281,19 @@ ShellCommandRunDmem (
AcpiTableAddress,
Acpi20TableAddress,
MpsTableAddress,
- SmbiosTableAddress
+ SmbiosTableAddress,
+ DtbTableAddress,
+ MemoryAttributesTableAddress,
+ RtPropertiesTableAddress,
+ SystemResourceTableAddress,
+ DebugImageInfoTableAddress,
+ ImageExecutionTableAddress,
+ JsonConfigDataTableAddress,
+ JsonCapsuleDataTableAddress,
+ JsonCapsuleResultTableAddress,
+ MemoryRangeCapsuleAddress,
+ HiiDatabaseExportBufferAddress,
+ ConformanceProfileTableAddress
);
}
} else {
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
index b1d239ed37ea..c1067a0474cd 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
@@ -108,13 +108,27 @@
"---------------------------------------------\r\n"
"System: Table Structure size %08x revision %08x\r\n"
"ConIn (%016LX) ConOut (%016LX) StdErr (%016LX)\r\n"
- "Runtime Services %016LX\r\n"
- "Boot Services %016LX\r\n"
- "SAL System Table %016LX\r\n"
- "ACPI Table %016LX\r\n"
- "ACPI 2.0 Table %016LX\r\n"
- "MPS Table %016LX\r\n"
- "SMBIOS Table %016LX\r\n"
+ "Runtime Services %016LX\r\n"
+ "Boot Services %016LX\r\n"
+ "SAL System Table %016LX\r\n"
+ "ACPI Table %016LX\r\n"
+ "ACPI 2.0 Table %016LX\r\n"
+ "MPS Table %016LX\r\n"
+ "SMBIOS Table %016LX\r\n"
+ "DTB Table %016LX\r\n"
+ "Memory Attribute Table %016LX\r\n"
+ "RT Properties Table %016LX\r\n"
+ "System Resource Table %016LX\r\n"
+ "Debug Image Info Table %016LX\r\n"
+ "Image Execution Info Table %016LX\r\n"
+ "Json Config Data Table %016LX\r\n"
+ "Json Capsule Data Table %016LX\r\n"
+ "Json Capsule Results Table %016LX\r\n"
+ "Memory Range Capsule %016LX\r\n"
+ "Hii Database Export Buffer %016LX\r\n"
+ "Conformance Profile Table %016LX\r\n"
+
+
#string STR_LOAD_PCI_ROM_RES #language en-US "Image '%B%s%N' load result: %r\r\n"
#string STR_LOADPCIROM_CORRUPT #language en-US "%H%s%N: File '%B%s%N' Image %d is corrupt.\r\n"
--
2.25.1
next prev parent reply other threads:[~2023-02-07 21:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-07 21:19 [PATCH v1 0/1] Add all UEFI Config Tables to Dmem output Sam Kaynor
2023-02-07 21:19 ` Sam Kaynor [this message]
2023-02-14 15:56 ` [edk2-devel] [PATCH v1 1/1] ShellPkg: UefiShellDebug1CommandsLib: Uefi Config Tables in Dmem.c Sunny Wang
2023-02-16 9:17 ` Gao, Zhichao
2023-02-28 15:16 ` Samer El-Haj-Mahmoud
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=20230207211957.62077-2-Sam.Kaynor@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