Changeset 3e200736 in mainline

Timestamp:

2014-01-18T21:34:32Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a5361fb

Parents:

e26a9d95

Message:

uhci,ohci, ehci: Move interrupt replacement fibril to libusbhost

Location:

uspace

Files:

• drv/bus/usb/ehci/hc.c (modified) (3 diffs)
• drv/bus/usb/ehci/hc.h (modified) (1 diff)
• drv/bus/usb/ohci/hc.c (modified) (4 diffs)
• drv/bus/usb/uhci/hc.c (modified) (3 diffs)
• drv/bus/usb/uhci/hc.h (modified) (2 diffs)
• lib/usbhost/include/usb/host/hcd.h (modified) (1 diff)
• lib/usbhost/src/ddf_helpers.c (modified) (3 diffs)

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

@@ -92 +92 @@
 static void hc_start(hc_t *instance);
 static int hc_init_memory(hc_t *instance);
-static int interrupt_emulator(hc_t *instance);
 
 /** Generate IRQ code.
@@ -191 +190 @@
         hc_gain_control(instance);
 
-        if (!interrupts) {
-                instance->interrupt_emulator =
-                    fibril_create((int(*)(void*))interrupt_emulator, instance);
-                fibril_add_ready(instance->interrupt_emulator);
-        }
-
         ehci_rh_init(
             &instance->rh, instance->caps, instance->registers, "ehci rh");
@@ -256 +249 @@
 }
 
-/** Check status register regularly
- *
- * @param[in] instance EHCI hc driver structure.
- * @return Error code
- */
-int interrupt_emulator(hc_t *instance)
-{
-        assert(instance);
-        usb_log_info("Started interrupt emulator.\n");
-        while (1) {
-//              const uint32_t status = instance->registers->interrupt_status;
-//              instance->registers->interrupt_status = status;
-//              hc_interrupt(instance, status);
-                async_usleep(10000);
-        }
-        return EOK;
-}
-
 /** Turn off any (BIOS)driver that might be in control of the device.
  *

uspace/drv/bus/usb/ehci/hc.h

@@ -64 +64 @@
         list_t pending_batches;
 
-        /** Fibril for periodic checks if interrupts can't be used */
-        fid_t interrupt_emulator;
-
         /** Guards schedule and endpoint manipulation */
         fibril_mutex_t guard;

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

@@ -93 +93 @@
 static int hc_init_transfer_lists(hc_t *instance);
 static int hc_init_memory(hc_t *instance);
-static int interrupt_emulator(hc_t *instance);
 
 /** Generate IRQ code.
@@ -182 +181 @@
 
         hc_gain_control(instance);
-
-        if (!interrupts) {
-                instance->interrupt_emulator =
-                    fibril_create((int(*)(void*))interrupt_emulator, instance);
-                fibril_add_ready(instance->interrupt_emulator);
-        }
 
         ohci_rh_init(&instance->rh, instance->registers, "ohci rh");
@@ -280 +273 @@
         assert(instance);
 
-        async_usleep(10000);
         if (instance->registers){
                 *status = OHCI_RD(instance->registers->interrupt_status);
@@ -373 +365 @@
         }
 
-}
-
-/** Check status register regularly
- *
- * @param[in] instance OHCI hc driver structure.
- * @return Error code
- */
-int interrupt_emulator(hc_t *instance)
-{
-        assert(instance);
-        usb_log_info("Started interrupt emulator.\n");
-        while (1) {
-                const uint32_t status = instance->registers->interrupt_status;
-                instance->registers->interrupt_status = status;
-                hc_interrupt(instance, status);
-                async_usleep(10000);
-        }
-        return EOK;
 }
 

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

@@ -96 +96 @@
 static int hc_init_transfer_lists(hc_t *instance);
 
-static int hc_interrupt_emulator(void *arg);
 static int hc_debug_checker(void *arg);
 
@@ -245 +244 @@
 
         hc_init_hw(instance);
-        if (!interrupts) {
-                instance->interrupt_emulator =
-                    fibril_create(hc_interrupt_emulator, instance);
-                fibril_add_ready(instance->interrupt_emulator);
-        }
         (void)hc_debug_checker;
 
@@ -460 +454 @@
 }
 
-/** Polling function, emulates interrupts.
- *
- * @param[in] arg UHCI hc structure to use.
- * @return EOK (should never return)
- */
-int hc_interrupt_emulator(void* arg)
-{
-        usb_log_debug("Started interrupt emulator.\n");
-        hc_t *instance = arg;
-        assert(instance);
-
-        while (1) {
-                /* Read and clear status register */
-                uint16_t status = pio_read_16(&instance->registers->usbsts);
-                pio_write_16(&instance->registers->usbsts, status);
-                if (status != 0)
-                        usb_log_debug2("UHCI status: %x.\n", status);
-                hc_interrupt(instance, status);
-                async_usleep(UHCI_INT_EMULATOR_TIMEOUT);
-        }
-        return EOK;
-}
-
 /** Debug function, checks consistency of memory structures.
  *

uspace/drv/bus/usb/uhci/hc.h

@@ -93 +93 @@
 
 #define UHCI_FRAME_LIST_COUNT 1024
-#define UHCI_INT_EMULATOR_TIMEOUT 10000
 #define UHCI_DEBUGER_TIMEOUT 5000000
 #define UHCI_ALLOWED_HW_FAIL 5
-#define UHCI_NEEDED_IRQ_COMMANDS 5
 
 /** Main UHCI driver structure */
@@ -118 +116 @@
         /** Pointer table to the above lists, helps during scheduling */
         transfer_list_t *transfers[2][4];
-        /** Fibril periodically checking status register*/
-        fid_t interrupt_emulator;
         /** Indicator of hw interrupts availability */
         bool hw_interrupts;

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -76 +76 @@
         /** Driver implementation */
         hc_driver_t driver;
+
+        /** Interrupt replacement fibril */
+        fid_t polling_fibril;
 };
 

uspace/lib/usbhost/src/ddf_helpers.c

@@ -717 +717 @@
 
         assert(device);
-        assert(hw_res);
-        assert(handler);
-        assert(gen_irq_code);
+        if (!handler || !gen_irq_code)
+                return ENOTSUP;
 
         irq_code_t irq_code = {0};
@@ -768 +767 @@
         hcd->driver.irq_hook(hcd, status);
 }
+
+static int interrupt_polling(void *arg)
+{
+        hcd_t *hcd = arg;
+        assert(hcd);
+        if (!hcd->driver.status_hook || !hcd->driver.irq_hook)
+                return ENOTSUP;
+        uint32_t status = 0;
+        while (hcd->driver.status_hook(hcd, &status) == EOK) {
+                hcd->driver.irq_hook(hcd, status);
+                status = 0;
+                /* We should wait 1 frame - 1ms here, but this polling is a
+                 * lame crutch anyway so don't hog the system. 10ms is still
+                 * good enough for emergency mode */
+                async_usleep(10000);
+        }
+        return EOK;
+}
+
 /** Initialize hc and rh DDF structures and their respective drivers.
  *
@@ -816 +834 @@
         const int irq = hcd_ddf_setup_interrupts(device, &hw_res, irq_handler,
             gen_irq_code);
-        if (irq < 0) {
+        if (!(irq < 0)) {
+                usb_log_debug("Hw interrupts enabled.\n");
+        }
+
+        /* Init hw driver */
+        hcd_t *hcd = dev_to_hcd(device);
+        ret = driver_init(hcd, &hw_res, !(irq < 0));
+        hw_res_list_parsed_clean(&hw_res);
+        if (ret != EOK) {
+                usb_log_error("Failed to init uhci_hcd: %s.\n", str_error(ret));
+                goto irq_unregister;
+        }
+
+        /* Need working irq replacement to setup root hub */
+        if ((irq < 0) && hcd->driver.status_hook) {
+                hcd->polling_fibril = fibril_create(interrupt_polling, hcd);
+                if (hcd->polling_fibril == 0) {
+                        usb_log_error("Failed to create polling fibril\n");
+                        ret = ENOMEM;
+                        goto irq_unregister;
+                }
+                fibril_add_ready(hcd->polling_fibril);
                 usb_log_warning("Failed to enable interrupts: %s."
                     " Falling back to polling.\n", str_error(irq));
-        } else {
-                usb_log_debug("Hw interrupts enabled.\n");
-        }
-
-        /* Init hw driver */
-        ret = driver_init(dev_to_hcd(device), &hw_res, !(irq < 0));
-        hw_res_list_parsed_clean(&hw_res);
-        if (ret != EOK) {
-                usb_log_error("Failed to init uhci_hcd: %s.\n", str_error(ret));
-                goto irq_unregister;
         }