Changeset ddd0499d in mainline for uspace/drv/bus/usb/uhci/hc.c

Timestamp:

2013-09-12T22:05:13Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4285851b

Parents:

695b6ff (diff), 7de1988c (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:

Support for PIO window-relative and absolute HW resource ranges.

The goal of this merge is to allow bus drivers to pass resources with IO
and memory ranges to the child drivers either in the PIO window-relative
form or system bus absolute form. Using the PIO window and the
relative/absolute attribute of a range, each driver can now reconstruct
both forms. Helper functions are provided to automate these
transformations as much as possible.

Changes in this merge in a greater detail:

• Support for PIO_WINDOW_DEV_IFACE in isa so that it can provide the PIO window to its children.

• Add 'relative' member to both hw_resource_t.res.mem_range and hw_resource_t.res.io_range so that the drivers can actually tell whether a range is absolute (eg. it was absolutized by its parent).

• Add pio_enable_resource() to allow drivers to enable PIO without the need to actually care about what kind of range the resource contains. This is used by pci now.

• Automate things even more for drivers that use hw_res_get_list_parsed(). The parsed HW resources compute both forms (relative/absolute) and offer it to the driver which is using them. Such a driver then uses whatever form is more fit for it and its purposes.

• Drivers using the parsed resources can use pio_enable_range() to enable PIO and RNGABS*()/RNGREL()/RNGSZ courtesy macros for easier access to the actual range address/size are provided.

• Device drivers affected by these API changes were converted.

• uhcirh now requires uhci to provide PIO_WINDOW_DEV_IFACE; however, the uhcirh driver is removed in the feature USB branch so there was no point in implementing this feature and UHCI USB is thus temporarily broken.

File:

• uspace/drv/bus/usb/uhci/hc.c (modified) (9 diffs)

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

@@ -105 +105 @@
  * @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).
+ * @param[in] regs Device's register range.
  *
  * @return Error code.
@@ -112 +111 @@
 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)
+    size_t cmds_size, addr_range_t *regs)
 {
         if ((ranges_size < sizeof(uhci_irq_pio_ranges)) ||
             (cmds_size < sizeof(uhci_irq_commands)) ||
-            (reg_size < sizeof(uhci_regs_t)))
+            (RNGSZ(*regs) < sizeof(uhci_regs_t)))
                 return EOVERFLOW;
 
         memcpy(ranges, uhci_irq_pio_ranges, sizeof(uhci_irq_pio_ranges));
-        ranges[0].base = regs;
+        ranges[0].base = RNGABS(*regs);
 
         memcpy(cmds, uhci_irq_commands, sizeof(uhci_irq_commands));
-        uhci_regs_t *registers = (uhci_regs_t *) regs;
+        uhci_regs_t *registers = (uhci_regs_t *) RNGABSPTR(*regs);
         cmds[0].addr = &registers->usbsts;
         cmds[3].addr = &registers->usbsts;
@@ -133 +132 @@
  *
  * @param[in] device Host controller DDF device
- * @param[in] reg_base Register range base
- * @param[in] reg_size Register range size
+ * @param[in] regs Register range
  * @param[in] irq Interrupt number
  * @paran[in] handler Interrupt handler
@@ -140 +138 @@
  * @return EOK on success or negative error code
  */
-int hc_register_irq_handler(ddf_dev_t *device, uintptr_t reg_base, size_t reg_size,
-    int irq, interrupt_handler_t handler)
+int hc_register_irq_handler(ddf_dev_t *device, addr_range_t *regs, int irq,
+    interrupt_handler_t handler)
 {
         int rc;
@@ -147 +145 @@
         irq_cmd_t irq_cmds[hc_irq_cmd_count];
         rc = hc_get_irq_code(irq_ranges, sizeof(irq_ranges), irq_cmds,
-            sizeof(irq_cmds), reg_base, reg_size);
+            sizeof(irq_cmds), regs);
         if (rc != EOK) {
                 usb_log_error("Failed to generate IRQ commands: %s.\n",
@@ -232 +230 @@
  *
  * @param[in] instance Memory place to initialize.
- * @param[in] regs Address of I/O control registers.
- * @param[in] reg_size Size of I/O control registers.
+ * @param[in] regs Range of device's I/O control registers.
  * @param[in] interrupts True if hw interrupts should be used.
  * @return Error code.
@@ -241 +238 @@
  * interrupt fibrils.
  */
-int hc_init(hc_t *instance, void *regs, size_t reg_size, bool interrupts)
-{
-        assert(reg_size >= sizeof(uhci_regs_t));
+int hc_init(hc_t *instance, addr_range_t *regs, bool interrupts)
+{
+        assert(regs->size >= sizeof(uhci_regs_t));
         int rc;
 
@@ -251 +248 @@
         /* allow access to hc control registers */
         uhci_regs_t *io;
-        rc = pio_enable(regs, reg_size, (void **)&io);
+        rc = pio_enable_range(regs, (void **) &io);
         if (rc != EOK) {
                 usb_log_error("Failed to gain access to registers at %p: %s.\n",
@@ -260 +257 @@
         instance->registers = io;
         usb_log_debug(
-            "Device registers at %p (%zuB) accessible.\n", io, reg_size);
+            "Device registers at %p (%zuB) accessible.\n", io, regs->size);
 
         rc = hc_init_mem_structures(instance);