ArmVirtPkg/FdtClientDxe: add methods to iterate over memory nodes

Add high level methods to iterate over all 'reg' properties of all DT
nodes whose device_type properties have the value "memory". Since we are
modifying the FdtClient protocol, update the protocol and the only existing
implementation at the same time.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.c b/ArmVirtPkg/FdtClientDxe/FdtClientDxe.c
index 382e9af6bf845d9b9f434a737a6903f4495a3813..7cc0c44ca12ae9f2fcba1c02d47d650cbfc7e09f 100644 (file)
--- a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.c
+++ b/ArmVirtPkg/FdtClientDxe/FdtClientDxe.c
@@ -192,6 +192,79 @@ FindCompatibleNodeReg (
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

+STATIC\r
+EFI_STATUS\r
+EFIAPI\r
+FindNextMemoryNodeReg (\r
+  IN  FDT_CLIENT_PROTOCOL     *This,\r
+  IN  INT32                   PrevNode,\r
+  OUT INT32                   *Node,\r
+  OUT CONST VOID              **Reg,\r
+  OUT UINTN                   *AddressCells,\r
+  OUT UINTN                   *SizeCells,\r
+  OUT UINT32                  *RegSize\r
+  )\r
+{\r
+  INT32          Prev, Next;\r
+  CONST CHAR8    *DeviceType;\r
+  INT32          Len;\r
+  EFI_STATUS     Status;\r
+\r
+  ASSERT (mDeviceTreeBase != NULL);\r
+  ASSERT (Node != NULL);\r
+\r
+  for (Prev = PrevNode;; Prev = Next) {\r
+    Next = fdt_next_node (mDeviceTreeBase, Prev, NULL);\r
+    if (Next < 0) {\r
+      break;\r
+    }\r
+\r
+    DeviceType = fdt_getprop (mDeviceTreeBase, Next, "device_type", &Len);\r
+    if (DeviceType != NULL && AsciiStrCmp (DeviceType, "memory") == 0) {\r
+      //\r
+      // Get the 'reg' property of this memory node. For now, we will assume\r
+      // 8 byte quantities for base and size, respectively.\r
+      // TODO use #cells root properties instead\r
+      //\r
+      Status = GetNodeProperty (This, Next, "reg", Reg, RegSize);\r
+      if (EFI_ERROR (Status)) {\r
+        DEBUG ((EFI_D_WARN,\r
+          "%a: ignoring memory node with no 'reg' property\n",\r
+          __FUNCTION__));\r
+        continue;\r
+      }\r
+      if ((*RegSize % 16) != 0) {\r
+        DEBUG ((EFI_D_WARN,\r
+          "%a: ignoring memory node with invalid 'reg' property (size == 0x%x)\n",\r
+          __FUNCTION__, *RegSize));\r
+        continue;\r
+      }\r
+\r
+      *Node = Next;\r
+      *AddressCells = 2;\r
+      *SizeCells = 2;\r
+      return EFI_SUCCESS;\r
+    }\r
+  }\r
+  return EFI_NOT_FOUND;\r
+}\r
+\r
+STATIC\r
+EFI_STATUS\r
+EFIAPI\r
+FindMemoryNodeReg (\r
+  IN  FDT_CLIENT_PROTOCOL     *This,\r
+  OUT INT32                   *Node,\r
+  OUT CONST VOID              **Reg,\r
+  OUT UINTN                   *AddressCells,\r
+  OUT UINTN                   *SizeCells,\r
+  OUT UINT32                  *RegSize\r
+  )\r
+{\r
+  return FindNextMemoryNodeReg (This, 0, Node, Reg, AddressCells, SizeCells,\r
+           RegSize);\r
+}\r
+\r

 STATIC\r
 EFI_STATUS\r
 GetOrInsertChosenNode (\r
 STATIC\r
 EFI_STATUS\r
 GetOrInsertChosenNode (\r


@@ -225,6 +298,8 @@ STATIC FDT_CLIENT_PROTOCOL mFdtClientProtocol = {
   FindNextCompatibleNode,\r
   FindCompatibleNodeProperty,\r
   FindCompatibleNodeReg,\r
   FindNextCompatibleNode,\r
   FindCompatibleNodeProperty,\r
   FindCompatibleNodeReg,\r

+  FindMemoryNodeReg,\r
+  FindNextMemoryNodeReg,\r

   GetOrInsertChosenNode,\r
 };\r
 \r
   GetOrInsertChosenNode,\r
 };\r
 \r

diff --git a/ArmVirtPkg/Include/Protocol/FdtClient.h b/ArmVirtPkg/Include/Protocol/FdtClient.h
index b593c7441426c7d5bbd3299b94c7bc41feeefa0f..aad76db388beaf44384ad84623a682a74efc15f3 100644 (file)
--- a/ArmVirtPkg/Include/Protocol/FdtClient.h
+++ b/ArmVirtPkg/Include/Protocol/FdtClient.h
@@ -85,6 +85,29 @@ EFI_STATUS
   OUT UINT32                  *RegSize\r
   );\r
 \r
   OUT UINT32                  *RegSize\r
   );\r
 \r

+typedef\r
+EFI_STATUS\r
+(EFIAPI *FDT_CLIENT_FIND_NEXT_MEMORY_NODE_REG) (\r
+  IN  FDT_CLIENT_PROTOCOL     *This,\r
+  IN  INT32                   PrevNode,\r
+  OUT INT32                   *Node,\r
+  OUT CONST VOID              **Reg,\r
+  OUT UINTN                   *AddressCells,\r
+  OUT UINTN                   *SizeCells,\r
+  OUT UINT32                  *RegSize\r
+  );\r
+\r
+typedef\r
+EFI_STATUS\r
+(EFIAPI *FDT_CLIENT_FIND_MEMORY_NODE_REG) (\r
+  IN  FDT_CLIENT_PROTOCOL     *This,\r
+  OUT INT32                   *Node,\r
+  OUT CONST VOID              **Reg,\r
+  OUT UINTN                   *AddressCells,\r
+  OUT UINTN                   *SizeCells,\r
+  OUT UINT32                  *RegSize\r
+  );\r
+\r

 typedef\r
 EFI_STATUS\r
 (EFIAPI *FDT_CLIENT_GET_OR_INSERT_CHOSEN_NODE) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *FDT_CLIENT_GET_OR_INSERT_CHOSEN_NODE) (\r


@@ -101,6 +124,9 @@ struct _FDT_CLIENT_PROTOCOL {
   FDT_CLIENT_FIND_COMPATIBLE_NODE_PROPERTY FindCompatibleNodeProperty;\r
   FDT_CLIENT_FIND_COMPATIBLE_NODE_REG      FindCompatibleNodeReg;\r
 \r
   FDT_CLIENT_FIND_COMPATIBLE_NODE_PROPERTY FindCompatibleNodeProperty;\r
   FDT_CLIENT_FIND_COMPATIBLE_NODE_REG      FindCompatibleNodeReg;\r
 \r

+  FDT_CLIENT_FIND_MEMORY_NODE_REG          FindMemoryNodeReg;\r
+  FDT_CLIENT_FIND_NEXT_MEMORY_NODE_REG     FindNextMemoryNodeReg;\r
+\r

   FDT_CLIENT_GET_OR_INSERT_CHOSEN_NODE     GetOrInsertChosenNode;\r
 };\r
 \r
   FDT_CLIENT_GET_OR_INSERT_CHOSEN_NODE     GetOrInsertChosenNode;\r
 };\r
 \r