Changeset 6991188 in mainline

Timestamp:

2011-04-11T13:40:00Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d91645ab

Parents:

1a46610 (diff), 9f104af4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

OHCI prototype works (INT transfers too)

Tested on vbox 4.0.4, MS mouse and Logitech keyboard work

Location:

uspace/drv/ohci

Files:

• batch.c (modified) (2 diffs)
• hc.c (modified) (8 diffs)
• hc.h (modified) (1 diff)
• hw_struct/hcca.h (modified) (1 diff)
• hw_struct/transfer_descriptor.c (modified) (1 diff)
• hw_struct/transfer_descriptor.h (modified) (1 diff)
• main.c (modified) (1 diff)
• ohci_regs.h (modified) (1 diff)
• transfer_list.c (modified) (2 diffs)
• utils/malloc32.h (modified) (2 diffs)

uspace/drv/ohci/batch.c

@@ -145 +145 @@
                     data->tds[i].status, data->tds[i].cbp, data->tds[i].next,
                     data->tds[i].be);
-                if (!td_is_finished(&data->tds[i]))
+                if (!td_is_finished(&data->tds[i])) {
                         return false;
+                }
                 instance->error = td_error(&data->tds[i]);
                 /* FIXME: calculate real transfered size */
@@ -287 +288 @@
 
         /* data stage */
-        size_t td_current = 1;
+        size_t td_current = 0;
         size_t remain_size = instance->buffer_size;
         char *transfer_buffer = instance->transport_buffer;

uspace/drv/ohci/hc.c

@@ -113 +113 @@
             ret, str_error(ret));
         hc_init_hw(instance);
+        fibril_mutex_initialize(&instance->guard);
 
         rh_init(&instance->rh, dev, instance->registers);
@@ -135 +136 @@
         }
 
+        fibril_mutex_lock(&instance->guard);
         switch (batch->transfer_type) {
         case USB_TRANSFER_CONTROL:
@@ -157 +159 @@
         case USB_TRANSFER_INTERRUPT:
         case USB_TRANSFER_ISOCHRONOUS:
-                instance->registers->control &= ~C_PLE;
+                instance->registers->control &= (~C_PLE & ~C_IE);
                 transfer_list_add_batch(
                     instance->transfers[batch->transfer_type], batch);
-                instance->registers->control |= C_PLE;
+                instance->registers->control |= C_PLE | C_IE;
+                usb_log_debug2("Added periodic transfer: %x.\n",
+                    instance->registers->periodic_current);
                 break;
         default:
                 break;
         }
+        fibril_mutex_unlock(&instance->guard);
         return EOK;
 }
@@ -178 +183 @@
         usb_log_debug("OHCI interrupt: %x.\n", status);
 
-
         if (status & IS_WDH) {
+                fibril_mutex_lock(&instance->guard);
+                usb_log_debug2("HCCA: %p-%p(%p).\n", instance->hcca,
+                    instance->registers->hcca, addr_to_phys(instance->hcca));
+                usb_log_debug2("Periodic current: %p.\n",
+                    instance->registers->periodic_current);
                 LIST_INITIALIZE(done);
                 transfer_list_remove_finished(
@@ -197 +206 @@
                         usb_transfer_batch_finish(batch);
                 }
+                fibril_mutex_unlock(&instance->guard);
         }
 }
@@ -208 +218 @@
                 instance->registers->interrupt_status = status;
                 hc_interrupt(instance, status);
-                async_usleep(10000);
+                async_usleep(50000);
         }
         return EOK;
@@ -345 +355 @@
         SETUP_TRANSFER_LIST(transfers_control, "CONTROL");
         SETUP_TRANSFER_LIST(transfers_bulk, "BULK");
-
+#undef SETUP_TRANSFER_LIST
         transfer_list_set_next(&instance->transfers_interrupt,
             &instance->transfers_isochronous);
@@ -360 +370 @@
 
         return EOK;
-#undef CHECK_RET_CLEAR_RETURN
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/ohci/hc.h

@@ -69 +69 @@
         usb_endpoint_manager_t ep_manager;
         fid_t interrupt_emulator;
+        fibril_mutex_t guard;
 } hc_t;
 

uspace/drv/ohci/hw_struct/hcca.h

@@ -43 +43 @@
         uint32_t done_head;
         uint32_t reserved[29];
-} __attribute__((packed)) hcca_t;
+} __attribute__((packed, aligned)) hcca_t;
 
 #endif

uspace/drv/ohci/hw_struct/transfer_descriptor.c

@@ -53 +53 @@
         }
         if (buffer != NULL) {
+                assert(size != 0);
                 instance->cbp = addr_to_phys(buffer);
                 instance->be = addr_to_phys(buffer + size - 1);

uspace/drv/ohci/hw_struct/transfer_descriptor.h

@@ -86 +86 @@
         int cc = (instance->status >> TD_STATUS_CC_SHIFT) & TD_STATUS_CC_MASK;
         /* something went wrong, error code is set */
-        if (cc != CC_NOACCESS1 && cc != CC_NOACCESS2 && cc != CC_NOERROR) {
+        if (cc != CC_NOACCESS1 && cc != CC_NOACCESS2) {
                 return true;
         }

uspace/drv/ohci/main.c

@@ -92 +92 @@
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
+        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
         sleep(5);
         return ddf_driver_main(&ohci_driver);

uspace/drv/ohci/ohci_regs.h

@@ -100 +100 @@
 #define HCCA_PTR_MASK 0xffffff00 /* HCCA is 256B aligned */
 
-        /** Currently executed period endpoint */
-        const volatile uint32_t period_current;
+        /** Currently executed periodic endpoint */
+        const volatile uint32_t periodic_current;
 
         /** The first control endpoint */

uspace/drv/ohci/transfer_list.c

@@ -79 +79 @@
         assert(instance);
         assert(next);
-        /* Set both queue_head.next to point to the follower */
         ed_append_ed(instance->list_head, next->list_head);
 }
@@ -125 +124 @@
                 batch, instance->name, first, batch_ed(first));
         if (last_ed == instance->list_head) {
-                usb_log_debug2("%s head ED: %x:%x:%x:%x.\n", instance->name,
-                        last_ed->status, last_ed->td_tail, last_ed->td_head,
-                        last_ed->next);
+                usb_log_debug2("%s head ED(%p-%p): %x:%x:%x:%x.\n",
+                    instance->name, last_ed, instance->list_head_pa,
+                    last_ed->status, last_ed->td_tail, last_ed->td_head,
+                    last_ed->next);
         }
         fibril_mutex_unlock(&instance->guard);

uspace/drv/ohci/utils/malloc32.h

@@ -41 +41 @@
 #include <as.h>
 
-#define UHCI_STRCUTURES_ALIGNMENT 16
 #define UHCI_REQUIRED_PAGE_SIZE 4096
 
@@ -65 +64 @@
  */
 static inline void * malloc32(size_t size)
-        { return memalign(UHCI_STRCUTURES_ALIGNMENT, size); }
+        { return memalign(size, size); }
 /*----------------------------------------------------------------------------*/
 /** Physical mallocator simulator