Ticket #9074: 0001-Fix-3079-and-9074-Memory-alocation-beyond-256MB.2.patch

headers/os/kernel/OS.h

@@ -71 +71 @@
 #define B_LOMEM                 4   /* B_CONTIGUOUS, < 16 MB physical address */
 #define B_32_BIT_FULL_LOCK      5   /* B_FULL_LOCK, < 4 GB physical addresses */
 #define B_32_BIT_CONTIGUOUS     6   /* B_CONTIGUOUS, < 4 GB physical address */
+#define B_CONTIGUOUS_WITH_LIMIT 8   /* B_CONTIGUOUS, < physical address passed
+into the logaddr of the create_area function */
 
 /* address spec for create_area(), and clone_area() */
 #define B_ANY_ADDRESS               0

src/add-ons/kernel/drivers/audio/ice1712/util.c

@@ -50 +50 @@
 {
 // TODO: phy should be phys_addr_t*!
     physical_entry pe;
-    void * logadr;
+    void * logadr = (void*)(1 << 28);
     area_id areaid;
     status_t rv;
 
@@ -58 +58 @@
 
     size = round_to_pagesize(size);
     areaid = create_area(name, &logadr, B_ANY_KERNEL_ADDRESS, size,
-        B_32_BIT_CONTIGUOUS, B_READ_AREA | B_WRITE_AREA);
-        // TODO: The rest of the code doesn't deal correctly with physical
-        // addresses > 4 GB, so we have to force 32 bit addresses here.
+        B_CONTIGUOUS_WITH_LIMIT, B_READ_AREA | B_WRITE_AREA);
+        // ICE1712 chipset can not deal with memory area beyond 256MB
     if (areaid < B_OK) {
         TRACE("couldn't allocate area %s\n",name);
         return B_ERROR;

src/system/kernel/vm/vm.cpp

@@ -1280 +1280 @@
             wiring = B_CONTIGUOUS;
             doReserveMemory = true;
             break;
+        case B_CONTIGUOUS_WITH_LIMIT:
+                if (vm_page_max_address() >= (phys_addr_t)(*_address)) {
+                    stackPhysicalRestrictions = *physicalAddressRestrictions;
+                    stackPhysicalRestrictions.high_address
+                        = (phys_addr_t)(*_address);
+                    physicalAddressRestrictions = &stackPhysicalRestrictions;
+                }
+            wiring = B_CONTIGUOUS;
+            doReserveMemory = true;
+            break;
         default:
             return B_BAD_VALUE;
     }