ShellPkg: Update shell command memmap to show unaccepted memory

RFC: https://bugzilla.tianocore.org/show_bug.cgi?id=3937

ShellCommandRunMemMap() is updated to handle the case of unaccepted
memory type.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Erdem Aktas <erdemaktas@google.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Zhichao Gao <zhichao.gao@intel.com>
Signed-off-by: Min Xu <min.m.xu@intel.com>

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/MemMap.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/MemMap.c
index 72f3c58b0970c4ffa52aacd5d410c239c63c9d61..a089953b286f336a849c9207c3f13bfb2dc30b47 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/MemMap.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/MemMap.c
@@ -26,6 +26,7 @@ STATIC CONST CHAR16  NameEfiACPIMemoryNVS[]           = L"ACPIMemoryNVS";
 STATIC CONST CHAR16  NameEfiMemoryMappedIO[]          = L"MemoryMappedIO";\r
 STATIC CONST CHAR16  NameEfiMemoryMappedIOPortSpace[] = L"MemoryMappedIOPortSpace";\r
 STATIC CONST CHAR16  NameEfiPalCode[]                 = L"PalCode";\r
+STATIC CONST CHAR16  NameEfiUnacceptedMemoryType[]    = L"Unaccepted";\r
 \r
 //\r
 // Need short names for some memory types\r
@@ -151,6 +152,8 @@ ShellCommandRunMemMap (
   UINT64                 UnusableMemoryPagesSize;\r
   UINT64                 PalCodePages;\r
   UINT64                 PalCodePagesSize;\r
+  UINT64                 UnacceptedPages;\r
+  UINT64                 UnacceptedPagesSize;\r
   UINT64                 PersistentPages;\r
   UINT64                 PersistentPagesSize;\r
   BOOLEAN                Sfo;\r
@@ -175,6 +178,7 @@ ShellCommandRunMemMap (
   PalCodePages        = 0;\r
   PersistentPages     = 0;\r
   Size                = 0;\r
+  UnacceptedPages     = 0;\r
   Descriptors         = NULL;\r
   ShellStatus         = SHELL_SUCCESS;\r
   Status              = EFI_SUCCESS;\r
@@ -303,6 +307,11 @@ ShellCommandRunMemMap (
               TotalPages   += Walker->NumberOfPages;\r
               PalCodePages += Walker->NumberOfPages;\r
               break;\r
+            case EfiUnacceptedMemoryType:\r
+              ShellPrintHiiEx (-1, -1, NULL, (EFI_STRING_ID)(!Sfo ? STRING_TOKEN (STR_MEMMAP_LIST_ITEM) : STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, NameEfiUnacceptedMemoryType, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64 (SIZE_4KB, Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);\r
+              TotalPages      += Walker->NumberOfPages;\r
+              UnacceptedPages += Walker->NumberOfPages;\r
+              break;\r
             default:\r
               //\r
               // Shell Spec defines the SFO format.\r
@@ -335,6 +344,7 @@ ShellCommandRunMemMap (
         MmioSpacePagesSize      = MultU64x64 (SIZE_4KB, MmioSpacePages);\r
         MmioPortPagesSize       = MultU64x64 (SIZE_4KB, MmioPortPages);\r
         PalCodePagesSize        = MultU64x64 (SIZE_4KB, PalCodePages);\r
+        UnacceptedPagesSize     = MultU64x64 (SIZE_4KB, UnacceptedPages);\r
         PersistentPagesSize     = MultU64x64 (SIZE_4KB, PersistentPages);\r
         UnusableMemoryPagesSize = MultU64x64 (SIZE_4KB, UnusableMemoryPages);\r
         if (!Sfo) {\r
@@ -368,6 +378,8 @@ ShellCommandRunMemMap (
             MmioPortPagesSize,\r
             PalCodePages,\r
             PalCodePagesSize,\r
+            UnacceptedPages,\r
+            UnacceptedPagesSize,\r
             AvailPages,\r
             AvailPagesSize,\r
             PersistentPages,\r
@@ -422,6 +434,7 @@ ShellCommandRunMemMap (
             AcpiReclaimPagesSize,\r
             AcpiNvsPagesSize,\r
             PalCodePagesSize,\r
+            UnacceptedPagesSize,\r
             PersistentPagesSize\r
             );\r
         }\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
index 6693be26e6996a5a64659b86af03e71ae7e90bbb..b1d239ed37ea31c15d08935af73de0eabe5b02cf 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
@@ -88,13 +88,14 @@
                                                   "  MMIO      : %,14ld Pages (%,ld Bytes)\r\n"\r
                                                   "  MMIO_Port : %,14ld Pages (%,ld Bytes)\r\n"\r
                                                   "  PalCode   : %,14ld Pages (%,ld Bytes)\r\n"\r
+                                                  "  Unaccepted: %,14ld Pages (%,ld Bytes)\r\n"\r
                                                   "  Available : %,14ld Pages (%,ld Bytes)\r\n"\r
                                                   "  Persistent: %,14ld Pages (%,ld Bytes)\r\n"\r
 #string STR_MEMMAP_LIST_SUMM_OTHER #language en-US    "  %08x  : %,14ld Pages (%,ld Bytes)\r\n"\r
 #string STR_MEMMAP_LIST_SUMM2     #language en-US "              -------------- \r\n"\r
                                                   "Total Memory: %,14ld MB (%,ld Bytes)\r\n"\r
 #string STR_MEMMAP_LIST_ITEM_SFO  #language en-US "MemoryMap,"%s","%LX","%LX","%LX","%LX"\r\n"\r
-#string STR_MEMMAP_LIST_SUMM_SFO  #language en-US "MemoryMapSummary,"%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld"\r\n"\r
+#string STR_MEMMAP_LIST_SUMM_SFO  #language en-US "MemoryMapSummary,"%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld","%Ld", "%Ld"\r\n"\r
 \r
 #string STR_EFI_COMPRESS_FAIL     #language en-US "Unable to compress: %r.\r\n"\r
 #string STR_EFI_DECOMPRESS_FAIL   #language en-US "Unable to decompress: %r.\r\n"\r