Changeset 100036 in vbox

Timestamp:

Jun 1, 2023 3:13:25 PM (18 months ago)

Author:

vboxsync

Message:

Runtime/RTFdt: Some additions and fixes, bugref:10401

Location:

trunk

Files:

• include/iprt/fdt.h (modified) (1 diff)
• include/iprt/mangling.h (modified) (1 diff)
• src/VBox/Runtime/common/misc/fdt.cpp (modified) (12 diffs)

trunk/include/iprt/fdt.h

@@ -121 +121 @@
 
 /**
+ * Allocates a new phandle serving as a unique identifer within the given FDT.
+ *
+ * @returns The phandle value
+ * @retval  UINT32_MAX in case the given FDT handle is invalid or the FDT is out of free phandle values.
+ * @param   hFdt            The flattened devicetree handle to destroy.
+ */
+RTDECL(uint32_t) RTFdtPHandleAllocate(RTFDT hFdt);
+
+
+/**
  * Dumps the given flattened devicetree to the given VFS file.
  *

trunk/include/iprt/mangling.h

@@ -965 +965 @@
 # define RTFdtNodePropertyAddString                     RT_MANGLER(RTFdtNodePropertyAddString)
 # define RTFdtNodePropertyAddU32                        RT_MANGLER(RTFdtNodePropertyAddU32)
+# define RTFdtPHandleAllocate                           RT_MANGLER(RTFdtPHandleAllocate)
 # define RTFdtSetPhysBootCpuId                          RT_MANGLER(RTFdtSetPhysBootCpuId)
 # define RTFileAioCtxAssociateWithFile                  RT_MANGLER(RTFileAioCtxAssociateWithFile)

trunk/src/VBox/Runtime/common/misc/fdt.cpp

@@ -45 +45 @@
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/file.h>
 #include <iprt/log.h>
 #include <iprt/mem.h>
@@ -93 +94 @@
     /** Current tree depth in the structure block. */
     uint32_t                cTreeDepth;
+    /** The next free phandle value. */
+    uint32_t                idPHandle;
 } RTFDTINT;
 /** Pointer to the internal Flattened Devicetree instance. */
@@ -266 +269 @@
     pThis->u32CpuIdPhysBoot = 0;
     pThis->cTreeDepth       = 0;
+    pThis->idPHandle        = UINT32_MAX;
     RTMemFree(pThis);
 }
@@ -415 +419 @@
                         pThis->cbStruct         = DtbHdr.cbDtStruct;
                         pThis->u32CpuIdPhysBoot = DtbHdr.u32CpuIdPhysBoot;
+                        pThis->idPHandle        = UINT32_MAX; /** @todo Would need to parse the whole tree to find the next free handle. */
 
                         /* Load the memory reservation block. */
@@ -1193 +1198 @@
 
     uint32_t cbNew = RT_ALIGN_32(pThis->cbStruct + cbSpaceRequired, _1K);
+    Assert(cbNew > pThis->cbStructMax);
     void *pvStructNew = RTMemReallocZ(pThis->pbStruct, pThis->cbStructMax, cbNew);
     if (!pvStructNew)
@@ -1301 +1307 @@
     if (pThis)
     {
+        pThis->idPHandle = 1; /* 0 is invalid */
+
         /* Add the root node. */
         rc = RTFdtNodeAdd(pThis, "");
@@ -1332 +1340 @@
 RTDECL(int) RTFdtCreateFromFile(PRTFDT phFdt, const char *pszFilename, RTFDTTYPE enmInType, PRTERRINFO pErrInfo)
 {
-    RT_NOREF(phFdt, pszFilename, enmInType, pErrInfo);
-    return VERR_NOT_IMPLEMENTED;
+    RTVFSIOSTREAM hVfsIos = NIL_RTVFSIOSTREAM;
+    int rc = RTVfsChainOpenIoStream(pszFilename, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE,
+                                    &hVfsIos, NULL /*poffError*/, pErrInfo);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    rc = RTFdtCreateFromVfsIoStrm(phFdt, hVfsIos, enmInType, pErrInfo);
+    RTVfsIoStrmRelease(hVfsIos);
+    return rc;
 }
 
@@ -1360 +1375 @@
         return rc;
 
-    uint32_t *pu32 = (uint32_t *)pThis->pbStruct;
-    while (pThis->cTreeDepth--)
+    uint32_t *pu32 = (uint32_t *)(pThis->pbStruct + pThis->cbStruct);
+    while (pThis->cTreeDepth)
+    {
         *pu32++ = DTB_FDT_TOKEN_END_NODE_BE;
+        pThis->cTreeDepth--;
+    }
 
     *pu32 = DTB_FDT_TOKEN_END_BE;
     pThis->cbStruct += cbStructSpace;
     return VINF_SUCCESS;
+}
+
+
+RTDECL(uint32_t) RTFdtPHandleAllocate(RTFDT hFdt)
+{
+    PRTFDTINT pThis = hFdt;
+    AssertPtrReturn(pThis, UINT32_MAX);
+
+    return pThis->idPHandle++;
 }
 
@@ -1388 +1415 @@
 RTDECL(int) RTFdtDumpToFile(RTFDT hFdt, RTFDTTYPE enmOutType, uint32_t fFlags, const char *pszFilename, PRTERRINFO pErrInfo)
 {
-    RT_NOREF(hFdt, enmOutType, fFlags, pszFilename, pErrInfo);
-    return VERR_NOT_IMPLEMENTED;
+    RTVFSIOSTREAM hVfsIos = NIL_RTVFSIOSTREAM;
+    int rc = RTVfsChainOpenIoStream(pszFilename, RTFILE_O_WRITE | RTFILE_O_CREATE | RTFILE_O_DENY_NONE,
+                                    &hVfsIos, NULL /*poffError*/, pErrInfo);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    rc = RTFdtDumpToVfsIoStrm(hFdt, enmOutType, fFlags, hVfsIos, pErrInfo);
+    RTVfsIoStrmRelease(hVfsIos);
+    return rc;
 }
 
@@ -1493 +1527 @@
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
 
-    RT_H2BE_U32(u32);
+    u32 = RT_H2BE_U32(u32);
     return rtFdtStructAppendProperty(pThis, pszProperty, &u32, sizeof(u32));
 }
@@ -1529 +1563 @@
         return rc;
 
-    uint32_t cbPropAligned = RT_ALIGN_32(cCells * sizeof(uint32_t) + 3 * sizeof(uint32_t), sizeof(uint32_t));
-
-    rc = rtFdtStructEnsureSpace(pThis, cbPropAligned);
+    uint32_t cbProp = cCells * sizeof(uint32_t) + 3 * sizeof(uint32_t);
+
+    rc = rtFdtStructEnsureSpace(pThis, cbProp);
     if (RT_FAILURE(rc))
         return rc;
@@ -1540 +1574 @@
     *pu32++ = RT_H2BE_U32(offStr);
     for (uint32_t i = 0; i < cCells; i++)
-        *pu32++ = va_arg(va, uint32_t);
-
-    pThis->cbStruct += cbPropAligned;
-    return VINF_SUCCESS;
-}
+    {
+        uint32_t u32 = va_arg(va, uint32_t);
+        *pu32++ = RT_H2BE_U32(u32);
+    }
+
+    pThis->cbStruct += cbProp;
+    return VINF_SUCCESS;
+}