Changeset 45cbf897 in mainline for uspace/lib/usbhost/include/usb/host/utils/malloc32.h

Timestamp:

2015-07-03T03:54:45Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8fc61c8

Parents:

e6d7df1

Message:

ehci, libusbhost: Move malloc32 to libusbhost.

So it can be shared with other HCDs.
Make sure the memory is mapped before returning from malloc32.
Add poison.

Fixes non-cntl transfers for ehci

File:

• uspace/lib/usbhost/include/usb/host/utils/malloc32.h (moved) (moved from uspace/drv/bus/usb/ehci/utils/malloc32.h ) (4 diffs)

uspace/lib/usbhost/include/usb/host/utils/malloc32.h

@@ -35 +35 @@
 #define DRV_EHCI_UTILS_MALLOC32_H
 
+#include <align.h>
 #include <as.h>
 #include <ddi.h>
@@ -65 +66 @@
 }
 
-/** Create 4KB page mapping
- *
- * @return Address of the mapped page, NULL on failure.
- */
-static inline void *get_page(void)
-{
-        uintptr_t phys;
-        void *address = AS_AREA_ANY;
-
-        const int ret = dmamem_map_anonymous(EHCI_REQUIRED_PAGE_SIZE,
-            DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
-            &address);
-
-        return ((ret == EOK) ? address : NULL);
-}
-
-static inline void return_page(void *page)
-{
-        dmamem_unmap_anonymous(page);
-}
-
 /** Physical mallocator simulator
  *
@@ -93 +73 @@
 static inline void * malloc32(size_t size)
 {
-        assert(size < PAGE_SIZE);
-        return get_page();
+        uintptr_t phys;
+        void *address = AS_AREA_ANY;
+        size_t real_size = ALIGN_UP(size, PAGE_SIZE);
+
+        const int ret = dmamem_map_anonymous(real_size,
+            DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
+            &address);
+
+        if (ret == EOK) {
+                /* Poison, accessing it should be enough to make sure
+                 * the location is mapped, but poison works better */
+                memset(address, 0x5, real_size);
+                return address;
+        }
+        return NULL;
 }
 
@@ -103 +96 @@
 static inline void free32(void *addr)
 {
-        return_page(addr);
+        dmamem_unmap_anonymous(addr);
 }
+
+/** Create 4KB page mapping
+ *
+ * @return Address of the mapped page, NULL on failure.
+ */
+static inline void *get_page()
+{
+        return malloc32(PAGE_SIZE);
+}
+
+static inline void return_page(void *page)
+{
+        free32(page);
+}
+
 
 #endif