Changeset 100321 in vbox

Timestamp:

Jun 28, 2023 10:55:34 AM (17 months ago)

Author:

vboxsync

Message:

Runtime/r0drv/linux/alloc-r0drv-linux.c: Make it work on ARM, bugref:10457

File:

• trunk/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c (modified) (6 diffs)

trunk/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c

@@ -155 +155 @@
     int             cOrder;
     unsigned        cPages;
+    void           *pvRet;
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     struct page    *paPages;
-    void           *pvRet;
+#endif
     IPRT_LINUX_SAVE_EFL_AC();
 
@@ -171 +173 @@
     cPages = cb >> PAGE_SHIFT;
     cOrder = CalcPowerOf2Order(cPages);
-#if (defined(RT_ARCH_AMD64) || defined(CONFIG_X86_PAE)) && defined(GFP_DMA32)
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+# if (defined(RT_ARCH_AMD64) || defined(CONFIG_X86_PAE)) && defined(GFP_DMA32)
     /* ZONE_DMA32: 0-4GB */
     paPages = alloc_pages(GFP_DMA32 | __GFP_NOWARN, cOrder);
     if (!paPages)
-#endif
-#ifdef RT_ARCH_AMD64
+# endif
+# ifdef RT_ARCH_AMD64
         /* ZONE_DMA; 0-16MB */
         paPages = alloc_pages(GFP_DMA | __GFP_NOWARN, cOrder);
-#else
+# else
         /* ZONE_NORMAL: 0-896MB */
         paPages = alloc_pages(GFP_USER | __GFP_NOWARN, cOrder);
-#endif
+# endif
     if (paPages)
     {
@@ -210 +213 @@
     else
         pvRet = NULL;
+#else
+    pvRet = (void *)__get_free_pages(GFP_DMA32 | __GFP_NOWARN, cOrder);
+    if (pvRet)
+        *pPhys = virt_to_phys(pvRet);
+#endif
 
     IPRT_LINUX_RESTORE_EFL_AC();
@@ -229 +237 @@
         int             cOrder;
         unsigned        cPages;
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
         unsigned        iPage;
         struct page    *paPages;
+#endif
         IPRT_LINUX_SAVE_EFL_AC();
 
@@ -241 +251 @@
         cPages = cb >> PAGE_SHIFT;
         cOrder = CalcPowerOf2Order(cPages);
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
         paPages = virt_to_page(pv);
 
@@ -251 +262 @@
         }
         __free_pages(paPages, cOrder);
+#else
+        free_pages((uintptr_t)pv, cOrder);
+#endif
         IPRT_LINUX_RESTORE_EFL_AC();
     }