ArmPlatformPkg/EblCmdLib: Add the 'devicepaths' EBL command

This command start alls the available drivers and prints out all the
device paths of the platform.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11801 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.c b/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.c
index 92894447561e0cfd92cb501806bb17a5c307a8bc..fee7f5259649e78035017f6c7377a35d853a2c37 100644 (file)
--- a/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.c
+++ b/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.c
@@ -29,11 +29,13 @@
 #include <Library/PeCoffGetEntryPointLib.h>\r
 #include <Library/PerformanceLib.h>\r
 #include <Library/TimerLib.h>\r
 #include <Library/PeCoffGetEntryPointLib.h>\r
 #include <Library/PerformanceLib.h>\r
 #include <Library/TimerLib.h>\r

+#include <Library/BdsLib.h>\r

 \r
 #include <Guid/DebugImageInfoTable.h>\r
 \r
 #include <Protocol/DebugSupport.h>\r
 #include <Protocol/LoadedImage.h>\r
 \r
 #include <Guid/DebugImageInfoTable.h>\r
 \r
 #include <Protocol/DebugSupport.h>\r
 #include <Protocol/LoadedImage.h>\r

+#include <Protocol/DevicePathToText.h>\r

 \r
 EFI_STATUS\r
 EblDumpMmu (\r
 \r
 EFI_STATUS\r
 EblDumpMmu (\r


@@ -183,7 +185,7 @@ ImageHandleToPdbFileName (
 }\r
 \r
 \r
 }\r
 \r
 \r

-CHAR8 *mTokenList[] = {\r
+STATIC CHAR8 *mTokenList[] = {\r

   /*"SEC",*/\r
   "PEI",\r
   "DXE",\r
   /*"SEC",*/\r
   "PEI",\r
   "DXE",\r


@@ -269,76 +271,112 @@ EblDumpGcd (
   IN CHAR8  **Argv\r
   )\r
 {\r
   IN CHAR8  **Argv\r
   )\r
 {\r

-    EFI_STATUS                        Status;\r
-    UINTN                           NumberOfDescriptors;\r
-    UINTN i;\r
-    EFI_GCD_MEMORY_SPACE_DESCRIPTOR *MemorySpaceMap;\r
-    EFI_GCD_IO_SPACE_DESCRIPTOR *IoSpaceMap;\r
-\r
-    Status = gDS->GetMemorySpaceMap(&NumberOfDescriptors,&MemorySpaceMap);\r
-    if (EFI_ERROR (Status)) {\r
-        return Status;\r
-    }\r
-    AsciiPrint ("    Address Range       Image     Device   Attributes\n");\r
-    AsciiPrint ("__________________________________________________________\n");\r
-    for (i=0; i < NumberOfDescriptors; i++) {\r
-        //AsciiPrint ("%016lx - %016lx",MemorySpaceMap[i].BaseAddress,MemorySpaceMap[i].BaseAddress+MemorySpaceMap[i].Length);\r
-        AsciiPrint ("MEM %08lx - %08lx",(UINT64)MemorySpaceMap[i].BaseAddress,MemorySpaceMap[i].BaseAddress+MemorySpaceMap[i].Length-1);\r
-        AsciiPrint (" %08x %08x",MemorySpaceMap[i].ImageHandle,MemorySpaceMap[i].DeviceHandle);\r
-\r
-        if (MemorySpaceMap[i].Attributes & EFI_MEMORY_RUNTIME)\r
-            AsciiPrint (" RUNTIME");\r
-        if (MemorySpaceMap[i].Attributes & EFI_MEMORY_PORT_IO)\r
-            AsciiPrint (" PORT_IO");\r
-\r
-        if (MemorySpaceMap[i].Attributes & EFI_MEMORY_UC)\r
-            AsciiPrint (" MEM_UC");\r
-        if (MemorySpaceMap[i].Attributes & EFI_MEMORY_WC)\r
-            AsciiPrint (" MEM_WC");\r
-        if (MemorySpaceMap[i].Attributes & EFI_MEMORY_WT)\r
-            AsciiPrint (" MEM_WT");\r
-        if (MemorySpaceMap[i].Attributes & EFI_MEMORY_WB)\r
-            AsciiPrint (" MEM_WB");\r
-        if (MemorySpaceMap[i].Attributes & EFI_MEMORY_UCE)\r
-            AsciiPrint (" MEM_UCE");\r
-        if (MemorySpaceMap[i].Attributes & EFI_MEMORY_WP)\r
-            AsciiPrint (" MEM_WP");\r
-        if (MemorySpaceMap[i].Attributes & EFI_MEMORY_RP)\r
-            AsciiPrint (" MEM_RP");\r
-        if (MemorySpaceMap[i].Attributes & EFI_MEMORY_XP)\r
-            AsciiPrint (" MEM_XP");\r
-\r
-        if (MemorySpaceMap[i].GcdMemoryType & EfiGcdMemoryTypeNonExistent)\r
-            AsciiPrint (" TYPE_NONEXISTENT");\r
-        if (MemorySpaceMap[i].GcdMemoryType & EfiGcdMemoryTypeReserved)\r
-            AsciiPrint (" TYPE_RESERVED");\r
-        if (MemorySpaceMap[i].GcdMemoryType & EfiGcdMemoryTypeSystemMemory)\r
-            AsciiPrint (" TYPE_SYSMEM");\r
-        if (MemorySpaceMap[i].GcdMemoryType & EfiGcdMemoryTypeMemoryMappedIo)\r
-            AsciiPrint (" TYPE_MEMMAP");\r
-\r
-        AsciiPrint ("\n");\r
-    }\r
+  EFI_STATUS                        Status;\r
+  UINTN                           NumberOfDescriptors;\r
+  UINTN i;\r
+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR *MemorySpaceMap;\r
+  EFI_GCD_IO_SPACE_DESCRIPTOR *IoSpaceMap;\r

 \r
 \r

-    Status = gDS->GetIoSpaceMap(&NumberOfDescriptors,&IoSpaceMap);\r
-    if (EFI_ERROR (Status)) {\r
-        return Status;\r
-    }\r
-    for (i=0; i < NumberOfDescriptors; i++) {\r
-        AsciiPrint ("IO  %08lx - %08lx",IoSpaceMap[i].BaseAddress,IoSpaceMap[i].BaseAddress+IoSpaceMap[i].Length);\r
-        AsciiPrint ("\t%08x %08x",IoSpaceMap[i].ImageHandle,IoSpaceMap[i].DeviceHandle);\r
-\r
-        if (IoSpaceMap[i].GcdIoType & EfiGcdMemoryTypeNonExistent)\r
-            AsciiPrint (" TYPE_NONEXISTENT");\r
-        if (IoSpaceMap[i].GcdIoType & EfiGcdMemoryTypeReserved)\r
-            AsciiPrint (" TYPE_RESERVED");\r
-        if (IoSpaceMap[i].GcdIoType & EfiGcdIoTypeIo)\r
-            AsciiPrint (" TYPE_IO");\r
-\r
-        AsciiPrint ("\n");\r
-    }\r
+  Status = gDS->GetMemorySpaceMap(&NumberOfDescriptors,&MemorySpaceMap);\r
+  if (EFI_ERROR (Status)) {\r
+      return Status;\r
+  }\r
+  AsciiPrint ("    Address Range       Image     Device   Attributes\n");\r
+  AsciiPrint ("__________________________________________________________\n");\r
+  for (i=0; i < NumberOfDescriptors; i++) {\r
+    AsciiPrint ("MEM %016lx - %016lx",(UINT64)MemorySpaceMap[i].BaseAddress,MemorySpaceMap[i].BaseAddress+MemorySpaceMap[i].Length-1);\r
+    AsciiPrint (" %08x %08x",MemorySpaceMap[i].ImageHandle,MemorySpaceMap[i].DeviceHandle);\r
+\r
+    if (MemorySpaceMap[i].Attributes & EFI_MEMORY_RUNTIME)\r
+        AsciiPrint (" RUNTIME");\r
+    if (MemorySpaceMap[i].Attributes & EFI_MEMORY_PORT_IO)\r
+        AsciiPrint (" PORT_IO");\r
+\r
+    if (MemorySpaceMap[i].Attributes & EFI_MEMORY_UC)\r
+        AsciiPrint (" MEM_UC");\r
+    if (MemorySpaceMap[i].Attributes & EFI_MEMORY_WC)\r
+        AsciiPrint (" MEM_WC");\r
+    if (MemorySpaceMap[i].Attributes & EFI_MEMORY_WT)\r
+        AsciiPrint (" MEM_WT");\r
+    if (MemorySpaceMap[i].Attributes & EFI_MEMORY_WB)\r
+        AsciiPrint (" MEM_WB");\r
+    if (MemorySpaceMap[i].Attributes & EFI_MEMORY_UCE)\r
+        AsciiPrint (" MEM_UCE");\r
+    if (MemorySpaceMap[i].Attributes & EFI_MEMORY_WP)\r
+        AsciiPrint (" MEM_WP");\r
+    if (MemorySpaceMap[i].Attributes & EFI_MEMORY_RP)\r
+        AsciiPrint (" MEM_RP");\r
+    if (MemorySpaceMap[i].Attributes & EFI_MEMORY_XP)\r
+        AsciiPrint (" MEM_XP");\r
+\r
+    if (MemorySpaceMap[i].GcdMemoryType & EfiGcdMemoryTypeNonExistent)\r
+        AsciiPrint (" TYPE_NONEXISTENT");\r
+    if (MemorySpaceMap[i].GcdMemoryType & EfiGcdMemoryTypeReserved)\r
+        AsciiPrint (" TYPE_RESERVED");\r
+    if (MemorySpaceMap[i].GcdMemoryType & EfiGcdMemoryTypeSystemMemory)\r
+        AsciiPrint (" TYPE_SYSMEM");\r
+    if (MemorySpaceMap[i].GcdMemoryType & EfiGcdMemoryTypeMemoryMappedIo)\r
+        AsciiPrint (" TYPE_MEMMAP");\r
+\r
+    AsciiPrint ("\n");\r
+  }\r
+\r
+  Status = gDS->GetIoSpaceMap(&NumberOfDescriptors,&IoSpaceMap);\r
+  if (EFI_ERROR (Status)) {\r
+      return Status;\r
+  }\r
+  for (i=0; i < NumberOfDescriptors; i++) {\r
+    AsciiPrint ("IO  %08lx - %08lx",IoSpaceMap[i].BaseAddress,IoSpaceMap[i].BaseAddress+IoSpaceMap[i].Length);\r
+    AsciiPrint ("\t%08x %08x",IoSpaceMap[i].ImageHandle,IoSpaceMap[i].DeviceHandle);\r
+\r
+    if (IoSpaceMap[i].GcdIoType & EfiGcdMemoryTypeNonExistent)\r
+        AsciiPrint (" TYPE_NONEXISTENT");\r
+    if (IoSpaceMap[i].GcdIoType & EfiGcdMemoryTypeReserved)\r
+        AsciiPrint (" TYPE_RESERVED");\r
+    if (IoSpaceMap[i].GcdIoType & EfiGcdIoTypeIo)\r
+        AsciiPrint (" TYPE_IO");\r
+\r
+    AsciiPrint ("\n");\r
+  }\r

 \r
 \r

+  return EFI_SUCCESS;\r
+}\r
+\r
+EFI_STATUS\r
+EblDevicePaths (\r
+  IN UINTN  Argc,\r
+  IN CHAR8  **Argv\r
+  )\r
+{\r
+  EFI_STATUS Status;\r
+  UINTN                              HandleCount;\r
+  EFI_HANDLE                         *HandleBuffer;\r
+  UINTN                              Index;\r
+  CHAR16*                            String;\r
+  EFI_DEVICE_PATH_PROTOCOL*          DevicePathProtocol;\r
+  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL*  DevicePathToTextProtocol;\r
+\r
+  BdsConnectAllDrivers();\r
+\r
+  Status = gBS->LocateProtocol(&gEfiDevicePathToTextProtocolGuid, NULL, (VOID **)&DevicePathToTextProtocol);\r
+  if (EFI_ERROR (Status)) {\r
+    AsciiPrint ("Did not find the DevicePathToTextProtocol.\n");\r
+    return EFI_SUCCESS;\r
+  }\r
+\r
+  Status = gBS->LocateHandleBuffer (ByProtocol, &gEfiDevicePathProtocolGuid, NULL, &HandleCount, &HandleBuffer);\r
+  if (EFI_ERROR (Status)) {\r
+    AsciiPrint ("No device path found\n");\r

     return EFI_SUCCESS;\r
     return EFI_SUCCESS;\r

+  }\r
+\r
+  for (Index = 0; Index < HandleCount; Index++) {\r
+    Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiDevicePathProtocolGuid, (VOID **)&DevicePathProtocol);\r
+    String = DevicePathToTextProtocol->ConvertDevicePathToText(DevicePathProtocol,TRUE,TRUE);\r
+    Print (L"[0x%X] %s\n",(UINT32)HandleBuffer[Index], String);\r
+  }\r
+\r
+  return EFI_SUCCESS;\r

 }\r
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED const EBL_COMMAND_TABLE mLibCmdTemplate[] =\r
 }\r
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED const EBL_COMMAND_TABLE mLibCmdTemplate[] =\r


@@ -372,6 +410,12 @@ GLOBAL_REMOVE_IF_UNREFERENCED const EBL_COMMAND_TABLE mLibCmdTemplate[] =
     " dump MMU Table",\r
     NULL,\r
     EblDumpMmu\r
     " dump MMU Table",\r
     NULL,\r
     EblDumpMmu\r

+  },\r
+  {\r
+    "devicepaths",\r
+    " list all the Device Paths",\r
+    NULL,\r
+    EblDevicePaths\r

   }\r
 };\r
 \r
   }\r
 };\r
 \r

diff --git a/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.inf b/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.inf
index fd327cd4a16b413f776046ae1c00548bcadd3969..0eb71a0108221a5bcb9a07ad1ec8d62ce60a4ac0 100644 (file)
--- a/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.inf
+++ b/ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.inf
@@ -1,6 +1,6 @@
 #/** @file\r
 #  \r
 #/** @file\r
 #  \r

-#  Copyright (c) 2010, ARM Ltd. All rights reserved.<BR>\r
+#  Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r


@@ -44,10 +44,12 @@
   ArmDisassemblerLib\r
   PerformanceLib\r
   TimerLib\r
   ArmDisassemblerLib\r
   PerformanceLib\r
   TimerLib\r

+  BdsLib\r

   \r
 [Protocols]\r
   \r
 [Protocols]\r

- gEfiDebugSupportProtocolGuid\r
- gEfiLoadedImageProtocolGuid\r
+  gEfiDebugSupportProtocolGuid\r
+  gEfiLoadedImageProtocolGuid\r
+  gEfiDevicePathToTextProtocolGuid\r

   \r
 [Guids]\r
   \r
 [Guids]\r

- gEfiDebugImageInfoTableGuid\r
+  gEfiDebugImageInfoTableGuid\r