Changeset 5b89d43b in mainline

Timestamp:

2013-12-14T11:54:29Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f5ceb18

Parents:

3558ba93

Message:

Unbreak USB UHCI support.

• Support PIO_WINDOW_DEV_IFACE in the uhci driver.
• Do not base the UHCI RH resources on the address obtained from pio_enable_range().
• Provide a restricted PIO window instead, based on the UHCI IO range. The UHCI RH resources are then relative to this window.

Location:

uspace/drv/bus/usb

Files:

• uhci/res.c (modified) (1 diff)
• uhci/root_hub.c (modified) (3 diffs)
• uhci/root_hub.h (modified) (2 diffs)
• uhci/uhci.c (modified) (2 diffs)
• uhcirh/main.c (modified) (1 diff)

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

@@ -62 +62 @@
         hw_res_list_parsed_t hw_res;
         hw_res_list_parsed_init(&hw_res);
-        const int ret =  hw_res_get_list_parsed(parent_sess, &hw_res, 0);
+        const int ret = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
         async_hangup(parent_sess);
         if (ret != EOK) {

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

@@ -36 +36 @@
 #include <str_error.h>
 #include <stdio.h>
+#include <device/hw_res_parsed.h>
 
 #include <usb/debug.h>
@@ -48 +49 @@
  * @return Error code.
  */
-int rh_init(rh_t *instance, ddf_fun_t *fun, uintptr_t reg_addr, size_t reg_size)
+int
+rh_init(rh_t *instance, ddf_fun_t *fun, addr_range_t *regs, uintptr_t reg_addr,
+    size_t reg_size)
 {
         assert(instance);
         assert(fun);
+
+        /* Crop the PIO window to the absolute address range of UHCI I/O. */
+        instance->pio_window.mem.base = 0;
+        instance->pio_window.mem.size = 0;
+        instance->pio_window.io.base = RNGABS(*regs);
+        instance->pio_window.io.size = RNGSZ(*regs);
 
         /* Initialize resource structure */
@@ -60 +69 @@
         instance->io_regs.res.io_range.address = reg_addr;
         instance->io_regs.res.io_range.size = reg_size;
+        instance->io_regs.res.io_range.relative = true;
         instance->io_regs.res.io_range.endianness = LITTLE_ENDIAN;
 

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

@@ -38 +38 @@
 #include <ddf/driver.h>
 #include <ops/hw_res.h>
+#include <ops/pio_window.h>
 
 /** DDF support structure for uhci_rhd driver, provides I/O resources */
@@ -45 +46 @@
         /** The only resource in the RH resource list */
         hw_resource_t io_regs;
+        /** PIO window in which the RH will operate. */
+        pio_window_t pio_window;        
 } rh_t;
 
-int rh_init(
-    rh_t *instance, ddf_fun_t *fun, uintptr_t reg_addr, size_t reg_size);
+extern int rh_init(rh_t *, ddf_fun_t *, addr_range_t *, uintptr_t, size_t);
 
 #endif

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

@@ -132 +132 @@
 };
 
+static pio_window_t *get_pio_window(ddf_fun_t *fun)
+{
+        rh_t *rh = ddf_fun_data_get(fun);
+        
+        if (rh == NULL)
+                return NULL;
+        return &rh->pio_window;
+}
+
+static pio_window_ops_t pio_window_iface = {
+        .get_pio_window = get_pio_window
+};
+
 /** RH function support for uhci_rhd */
 static ddf_dev_ops_t rh_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface,
-        .interfaces[HW_RES_DEV_IFACE] = &hw_res_iface
+        .interfaces[HW_RES_DEV_IFACE] = &hw_res_iface,
+        .interfaces[PIO_WINDOW_DEV_IFACE] = &pio_window_iface
 };
 
@@ -246 +260 @@
         }
 
-        rc = rh_init(&instance->rh, instance->rh_fun,
-            (uintptr_t)instance->hc.registers + 0x10, 4);
+        rc = rh_init(&instance->rh, instance->rh_fun, &regs, 0x10, 4);
         if (rc != EOK) {
                 usb_log_error("Failed to setup UHCI root hub: %s.\n",

uspace/drv/bus/usb/uhcirh/main.c

@@ -138 +138 @@
         hw_res_list_parsed_t hw_res;
         hw_res_list_parsed_init(&hw_res);
-        const int ret =  hw_res_get_list_parsed(parent_sess, &hw_res, 0);
+        const int ret = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
         async_hangup(parent_sess);
         if (ret != EOK) {