Changes in uspace/drv/bus/usb/ohci/hc.c [8b54fe6:d57122c] in mainline

File:

• uspace/drv/bus/usb/ohci/hc.c (modified) (11 diffs)

uspace/drv/bus/usb/ohci/hc.c

@@ -47 +47 @@
     (I_SO | I_WDH | I_UE | I_RHSC)
 
-static const irq_cmd_t ohci_irq_commands[] =
-{
-        { .cmd = CMD_MEM_READ_32, .dstarg = 1, .addr = NULL /*filled later*/ },
+static const irq_pio_range_t ohci_pio_ranges[] = {
+        {
+                .base = 0,      /* filled later */
+                .size = sizeof(ohci_regs_t)
+        }
+};
+
+static const irq_cmd_t ohci_irq_commands[] = {
+        { .cmd = CMD_PIO_READ_32, .dstarg = 1, .addr = NULL /* filled later */ },
         { .cmd = CMD_BTEST, .srcarg = 1, .dstarg = 2, .value = OHCI_USED_INTERRUPTS },
         { .cmd = CMD_PREDICATE, .srcarg = 2, .value = 2 },
-        { .cmd = CMD_MEM_WRITE_A_32, .srcarg = 1, .addr = NULL /*filled later*/ },
+        { .cmd = CMD_PIO_WRITE_A_32, .srcarg = 1, .addr = NULL /* filled later */ },
         { .cmd = CMD_ACCEPT },
 };
@@ -63 +69 @@
 static int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
 /*----------------------------------------------------------------------------*/
+/** Get number of PIO ranges used in IRQ code.
+ * @return Number of ranges.
+ */
+size_t hc_irq_pio_range_count(void)
+{
+        return sizeof(ohci_pio_ranges) / sizeof(irq_pio_range_t);
+}
+/*----------------------------------------------------------------------------*/
+/*----------------------------------------------------------------------------*/
 /** Get number of commands used in IRQ code.
  * @return Number of commands.
@@ -71 +86 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Generate IRQ code commands.
- * @param[out] cmds Place to store the commands.
- * @param[in] cmd_size Size of the place (bytes).
+/** Generate IRQ code.
+ * @param[out] ranges PIO ranges buffer.
+ * @param[in] ranges_size Size of the ranges buffer (bytes).
+ * @param[out] cmds Commands buffer.
+ * @param[in] cmds_size Size of the commands buffer (bytes).
  * @param[in] regs Physical address of device's registers.
  * @param[in] reg_size Size of the register area (bytes).
@@ -79 +96 @@
  * @return Error code.
  */
-int hc_get_irq_commands(
-    irq_cmd_t cmds[], size_t cmd_size, uintptr_t regs, size_t reg_size)
-{
-        if (cmd_size < sizeof(ohci_irq_commands)
-            || reg_size < sizeof(ohci_regs_t))
+int
+hc_get_irq_code(irq_pio_range_t ranges[], size_t ranges_size, irq_cmd_t cmds[],
+    size_t cmds_size, uintptr_t regs, size_t reg_size)
+{
+        if ((ranges_size < sizeof(ohci_pio_ranges)) ||
+            (cmds_size < sizeof(ohci_irq_commands)) ||
+            (reg_size < sizeof(ohci_regs_t)))
                 return EOVERFLOW;
 
-        /* Create register mapping to use in IRQ handler.
-         * This mapping should be present in kernel only.
-         * Remove it from here when kernel knows how to create mappings
-         * and accepts physical addresses in IRQ code.
-         * TODO: remove */
-        ohci_regs_t *registers;
-        const int ret = pio_enable((void*)regs, reg_size, (void**)&registers);
-        if (ret != EOK)
-                return ret;
-
-        /* Some bogus access to force create mapping. DO NOT remove,
-         * unless whole virtual addresses in irq is replaced
-         * NOTE: Compiler won't remove this as ohci_regs_t members
-         * are declared volatile.
-         *
-         * Introducing CMD_MEM set of IRQ code commands broke
-         * assumption that IRQ code does not cause page faults.
-         * If this happens during idling (THREAD == NULL)
-         * it causes kernel panic.
-         */
-        registers->revision;
+        memcpy(ranges, ohci_pio_ranges, sizeof(ohci_pio_ranges));
+        ranges[0].base = regs;
 
         memcpy(cmds, ohci_irq_commands, sizeof(ohci_irq_commands));
-
-        void *address = (void*)&registers->interrupt_status;
-        cmds[0].addr = address;
-        cmds[3].addr = address;
+        ohci_regs_t *registers = (ohci_regs_t *) regs;
+        cmds[0].addr = (void *) &registers->interrupt_status;
+        cmds[3].addr = (void *) &registers->interrupt_status;
+
         return EOK;
 }
@@ -127 +127 @@
         assert(hub_fun);
 
-        const usb_address_t hub_address =
-            usb_device_manager_get_free_address(
-                &instance->generic.dev_manager, USB_SPEED_FULL);
-        if (hub_address <= 0) {
+        /* Try to get address 1 for root hub. */
+        instance->rh.address = 1;
+        int ret = usb_device_manager_request_address(
+            &instance->generic.dev_manager, &instance->rh.address, false,
+            USB_SPEED_FULL);
+        if (ret != EOK) {
                 usb_log_error("Failed to get OHCI root hub address: %s\n",
-                    str_error(hub_address));
-                return hub_address;
-        }
-        instance->rh.address = hub_address;
-        usb_device_manager_bind(
-            &instance->generic.dev_manager, hub_address, hub_fun->handle);
+                    str_error(ret));
+                return ret;
+        }
 
 #define CHECK_RET_UNREG_RETURN(ret, message...) \
 if (ret != EOK) { \
         usb_log_error(message); \
-        usb_endpoint_manager_unregister_ep( \
-            &instance->generic.ep_manager, hub_address, 0, USB_DIRECTION_BOTH);\
-        usb_device_manager_release( \
-            &instance->generic.dev_manager, hub_address); \
+        usb_endpoint_manager_remove_ep( \
+            &instance->generic.ep_manager, instance->rh.address, 0, \
+            USB_DIRECTION_BOTH, NULL, NULL); \
+        usb_device_manager_release_address( \
+            &instance->generic.dev_manager, instance->rh.address); \
         return ret; \
 } else (void)0
-        int ret = usb_endpoint_manager_add_ep(
-            &instance->generic.ep_manager, hub_address, 0, USB_DIRECTION_BOTH,
-            USB_TRANSFER_CONTROL, USB_SPEED_FULL, 64, 0);
+
+        ret = usb_endpoint_manager_add_ep(
+            &instance->generic.ep_manager, instance->rh.address, 0,
+            USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL, USB_SPEED_FULL, 64,
+            0, NULL, NULL);
         CHECK_RET_UNREG_RETURN(ret,
             "Failed to register root hub control endpoint: %s.\n",
@@ -162 +164 @@
         CHECK_RET_UNREG_RETURN(ret,
             "Failed to bind root hub function: %s.\n", str_error(ret));
+
+        ret = usb_device_manager_bind_address(&instance->generic.dev_manager,
+            instance->rh.address, hub_fun->handle);
+        if (ret != EOK)
+                usb_log_warning("Failed to bind root hub address: %s.\n",
+                    str_error(ret));
 
         return EOK;
@@ -192 +200 @@
         list_initialize(&instance->pending_batches);
 
-        ret = hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11,
-            bandwidth_count_usb11);
-        CHECK_RET_RETURN(ret, "Failed to initialize generic driver: %s.\n",
-            str_error(ret));
+        hcd_init(&instance->generic, USB_SPEED_FULL,
+            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
         instance->generic.private_data = instance;
         instance->generic.schedule = hc_schedule;
         instance->generic.ep_add_hook = ohci_endpoint_init;
+        instance->generic.ep_remove_hook = ohci_endpoint_fini;
 
         ret = hc_init_memory(instance);
@@ -221 +228 @@
 }
 /*----------------------------------------------------------------------------*/
-void hc_enqueue_endpoint(hc_t *instance, endpoint_t *ep)
-{
+void hc_enqueue_endpoint(hc_t *instance, const endpoint_t *ep)
+{
+        assert(instance);
+        assert(ep);
+
         endpoint_list_t *list = &instance->lists[ep->transfer_type];
         ohci_endpoint_t *ohci_ep = ohci_endpoint_get(ep);
+        assert(list);
+        assert(ohci_ep);
+
         /* Enqueue ep */
         switch (ep->transfer_type) {
@@ -247 +260 @@
 }
 /*----------------------------------------------------------------------------*/
-void hc_dequeue_endpoint(hc_t *instance, endpoint_t *ep)
-{
+void hc_dequeue_endpoint(hc_t *instance, const endpoint_t *ep)
+{
+        assert(instance);
+        assert(ep);
+
         /* Dequeue ep */
         endpoint_list_t *list = &instance->lists[ep->transfer_type];
         ohci_endpoint_t *ohci_ep = ohci_endpoint_get(ep);
+
+        assert(list);
+        assert(ohci_ep);
         switch (ep->transfer_type) {
         case USB_TRANSFER_CONTROL:
@@ -565 +584 @@
 
         /*Init HCCA */
-        instance->hcca = malloc32(sizeof(hcca_t));
+        instance->hcca = hcca_get();
         if (instance->hcca == NULL)
                 return ENOMEM;
@@ -571 +590 @@
         usb_log_debug2("OHCI HCCA initialized at %p.\n", instance->hcca);
 
-        unsigned i = 0;
-        for (; i < 32; ++i) {
+        for (unsigned i = 0; i < 32; ++i) {
                 instance->hcca->int_ep[i] =
                     instance->lists[USB_TRANSFER_INTERRUPT].list_head_pa;