Changeset 001b152 in mainline

Timestamp:

2011-03-23T23:04:22Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

30718cc2

Parents:

05ead5c

Message:

Use simple slab allocator for hw accessible memory

Location:

uspace/drv/uhci-hcd

Files:

• Makefile (modified) (1 diff)
• hc.c (modified) (1 diff)
• transfer_list.c (modified) (5 diffs)
• utils/malloc32.h (modified) (5 diffs)
• utils/slab.c (added)
• utils/slab.h (added)

uspace/drv/uhci-hcd/Makefile

@@ -40 +40 @@
         root_hub.c \
         hw_struct/transfer_descriptor.c \
+        utils/slab.c \
         pci.c \
         batch.c

uspace/drv/uhci-hcd/hc.c

@@ -223 +223 @@
         ret = instance ? EOK : ENOMEM;
         CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to get frame list page.\n");
-        usb_log_debug("Initialized frame list.\n");
+        usb_log_debug("Initialized frame list at %p.\n", instance->frame_list);
 
         /* Set all frames to point to the first queue head */

uspace/drv/uhci-hcd/transfer_list.c

@@ -58 +58 @@
         }
         instance->queue_head_pa = addr_to_phys(instance->queue_head);
+        usb_log_debug2("Transfer list %s setup with QH: %p(%p).\n",
+            name, instance->queue_head, instance->queue_head_pa);
 
         qh_init(instance->queue_head);
@@ -118 +120 @@
         qh_set_next_qh(last_qh, pa);
 
+        asm volatile ("": : :"memory");
+//      asm volatile("clflush (%0)": : "r"(last_qh));
+
         /* Add to the driver list */
         list_append(&batch->link, &instance->batch_list);
@@ -159 +164 @@
         fibril_mutex_unlock(&instance->guard);
 
+        async_usleep(1000);
         while (!list_empty(&done)) {
                 link_t *item = done.next;
@@ -212 +218 @@
                     == addr_to_phys(batch_qh(batch)));
                 instance->queue_head->next = batch_qh(batch)->next;
+//              asm volatile("clflush (%0)" : : "r"(instance->queue_head));
                 qpos = "FIRST";
         } else {
@@ -220 +227 @@
                     == addr_to_phys(batch_qh(batch)));
                 batch_qh(prev)->next = batch_qh(batch)->next;
+//              asm volatile("clflush (%0)" : : "r"(batch_qh(prev)));
                 qpos = "NOT FIRST";
         }
+        asm volatile ("": : :"memory");
         /* Remove from the batch list */
         list_remove(&batch->link);

uspace/drv/uhci-hcd/utils/malloc32.h

@@ -40 +40 @@
 #include <as.h>
 
+#include "slab.h"
+
 #define UHCI_STRCUTURES_ALIGNMENT 16
 #define UHCI_REQUIRED_PAGE_SIZE 4096
+
 
 /** Get physical address translation
@@ -54 +57 @@
 
         uintptr_t result;
-        int ret = as_get_physical_mapping(addr, &result);
+        const int ret = as_get_physical_mapping(addr, &result);
+        assert(ret == EOK);
 
         if (ret != EOK)
@@ -66 +70 @@
  * @return Address of the alligned and big enough memory place, NULL on failure.
  */
-static inline void * malloc32(size_t size)
-        { return memalign(UHCI_STRCUTURES_ALIGNMENT, size); }
+static inline void * malloc32(size_t size) {
+        if (size <= SLAB_ELEMENT_SIZE)
+                return slab_malloc_g();
+        assert(false);
+        return memalign(UHCI_STRCUTURES_ALIGNMENT, size);
+}
 /*----------------------------------------------------------------------------*/
 /** Physical mallocator simulator
@@ -73 +81 @@
  * @param[in] addr Address of the place allocated by malloc32
  */
-static inline void free32(void *addr)
-        { if (addr) free(addr); }
+static inline void free32(void *addr) {
+        if (!addr)
+                return;
+        if (slab_in_range_g(addr))
+                return slab_free_g(addr);
+        free(addr);
+}
 /*----------------------------------------------------------------------------*/
 /** Create 4KB page mapping
@@ -82 +95 @@
 static inline void * get_page(void)
 {
-        void * free_address = as_get_mappable_page(UHCI_REQUIRED_PAGE_SIZE);
-        assert(free_address);
+        void *free_address = as_get_mappable_page(UHCI_REQUIRED_PAGE_SIZE);
+        assert(free_address); /* TODO: remove this assert */
         if (free_address == 0)
                 return NULL;
-        void* ret =
-          as_area_create(free_address, UHCI_REQUIRED_PAGE_SIZE,
+        void *ret = as_area_create(free_address, UHCI_REQUIRED_PAGE_SIZE,
                   AS_AREA_READ | AS_AREA_WRITE);
         if (ret != free_address)