Changes in uspace/drv/bus/usb/ehci/res.c [cffa14e6:7de1988c] in mainline

File:

• uspace/drv/bus/usb/ehci/res.c (modified) (10 diffs)

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

@@ -71 +71 @@
  *
  * @param[in] dev Device asking for the addresses.
- * @param[out] mem_reg_address Base address of the memory range.
- * @param[out] mem_reg_size Size of the memory range.
+ * @param[out] mem_regs_p Pointer to the register range.
  * @param[out] irq_no IRQ assigned to the device.
  * @return Error code.
  */
 int get_my_registers(ddf_dev_t *dev,
-    uintptr_t *mem_reg_address, size_t *mem_reg_size, int *irq_no)
+    addr_range_t *mem_regs_p, int *irq_no)
 {
         assert(dev);
@@ -99 +98 @@
         }
 
-        if (mem_reg_address)
-                *mem_reg_address = hw_res.mem_ranges.ranges[0].address;
-        if (mem_reg_size)
-                *mem_reg_size = hw_res.mem_ranges.ranges[0].size;
+        if (mem_regs_p)
+                *mem_regs_p = hw_res.mem_ranges.ranges[0];
         if (irq_no)
                 *irq_no = hw_res.irqs.irqs[0];
@@ -145 +142 @@
                 return ENOMEM;
 
-#define CHECK_RET_HANGUP_RETURN(ret, message...) \
-        if (ret != EOK) { \
-                usb_log_error(message); \
-                async_hangup(parent_sess); \
-                return ret; \
-        } else (void)0
-
         /* Read the first EEC. i.e. Legacy Support register */
         uint32_t usblegsup;
-        int ret = pci_config_space_read_32(parent_sess,
+        int rc = pci_config_space_read_32(parent_sess,
             eecp + USBLEGSUP_OFFSET, &usblegsup);
-        CHECK_RET_HANGUP_RETURN(ret,
-            "Failed to read USBLEGSUP: %s.\n", str_error(ret));
+        if (rc != EOK) {
+                usb_log_error("Failed to read USBLEGSUP: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
         usb_log_debug("USBLEGSUP: %" PRIx32 ".\n", usblegsup);
 
@@ -163 +157 @@
          * byte. (OS Control semaphore)*/
         usb_log_debug("Requesting OS control.\n");
-        ret = pci_config_space_write_8(parent_sess,
+        rc = pci_config_space_write_8(parent_sess,
             eecp + USBLEGSUP_OFFSET + 3, 1);
-        CHECK_RET_HANGUP_RETURN(ret, "Failed to request OS EHCI control: %s.\n",
-            str_error(ret));
+        if (rc != EOK) {
+                usb_log_error("Failed to request OS EHCI control: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
 
         size_t wait = 0;
         /* Wait for BIOS to release control. */
-        ret = pci_config_space_read_32(
+        rc = pci_config_space_read_32(
             parent_sess, eecp + USBLEGSUP_OFFSET, &usblegsup);
+        if (rc != EOK) {
+                usb_log_error("Failed reading PCI config space: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
         while ((wait < DEFAULT_WAIT) && (usblegsup & USBLEGSUP_BIOS_CONTROL)) {
                 async_usleep(WAIT_STEP);
-                ret = pci_config_space_read_32(parent_sess,
+                rc = pci_config_space_read_32(parent_sess,
                     eecp + USBLEGSUP_OFFSET, &usblegsup);
+                if (rc != EOK) {
+                        usb_log_error("Failed reading PCI config space: %s.\n",
+                            str_error(rc));
+                        goto error;
+                }
                 wait += WAIT_STEP;
         }
@@ -188 +196 @@
         usb_log_warning( "BIOS failed to release control after "
             "%zu usecs, force it.\n", wait);
-        ret = pci_config_space_write_32(parent_sess,
+        rc = pci_config_space_write_32(parent_sess,
             eecp + USBLEGSUP_OFFSET, USBLEGSUP_OS_CONTROL);
-        CHECK_RET_HANGUP_RETURN(ret, "Failed to force OS control: "
-            "%s.\n", str_error(ret));
+        if (rc != EOK) {
+                usb_log_error("Failed to force OS control: "
+                    "%s.\n", str_error(rc));
+                goto error;
+        }
+
         /*
          * Check capability type here, value of 01h identifies the capability
@@ -201 +213 @@
                 /* Read the second EEC Legacy Support and Control register */
                 uint32_t usblegctlsts;
-                ret = pci_config_space_read_32(parent_sess,
+                rc = pci_config_space_read_32(parent_sess,
                     eecp + USBLEGCTLSTS_OFFSET, &usblegctlsts);
-                CHECK_RET_HANGUP_RETURN(ret, "Failed to get USBLEGCTLSTS: %s.\n",
-                    str_error(ret));
+                if (rc != EOK) {
+                        usb_log_error("Failed to get USBLEGCTLSTS: %s.\n",
+                            str_error(rc));
+                        goto error;
+                }
+
                 usb_log_debug("USBLEGCTLSTS: %" PRIx32 ".\n", usblegctlsts);
                 /*
@@ -211 +227 @@
                  * interfering. NOTE: Three upper bits are WC
                  */
-                ret = pci_config_space_write_32(parent_sess,
+                rc = pci_config_space_write_32(parent_sess,
                     eecp + USBLEGCTLSTS_OFFSET, 0xe0000000);
-                CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) zero USBLEGCTLSTS.\n", ret);
+                if (rc != EOK) {
+                        usb_log_error("Failed(%d) zero USBLEGCTLSTS.\n", rc);
+                        goto error;
+                }
+
                 udelay(10);
-                ret = pci_config_space_read_32(parent_sess,
+                rc = pci_config_space_read_32(parent_sess,
                     eecp + USBLEGCTLSTS_OFFSET, &usblegctlsts);
-                CHECK_RET_HANGUP_RETURN(ret, "Failed to get USBLEGCTLSTS 2: %s.\n",
-                    str_error(ret));
+                if (rc != EOK) {
+                        usb_log_error("Failed to get USBLEGCTLSTS 2: %s.\n",
+                            str_error(rc));
+                        goto error;
+                }
+
                 usb_log_debug("Zeroed USBLEGCTLSTS: %" PRIx32 ".\n",
                     usblegctlsts);
@@ -224 +248 @@
 
         /* Read again Legacy Support register */
-        ret = pci_config_space_read_32(parent_sess,
+        rc = pci_config_space_read_32(parent_sess,
             eecp + USBLEGSUP_OFFSET, &usblegsup);
-        CHECK_RET_HANGUP_RETURN(ret, "Failed to read USBLEGSUP: %s.\n",
-            str_error(ret));
+        if (rc != EOK) {
+                usb_log_error("Failed to read USBLEGSUP: %s.\n",
+                    str_error(rc));
+                goto error;
+        }
+
         usb_log_debug("USBLEGSUP: %" PRIx32 ".\n", usblegsup);
         async_hangup(parent_sess);
         return EOK;
-#undef CHECK_RET_HANGUP_RETURN
+error:
+        async_hangup(parent_sess);
+        return rc;
 }
 
-int disable_legacy(ddf_dev_t *device, uintptr_t reg_base, size_t reg_size)
+int disable_legacy(ddf_dev_t *device, addr_range_t *reg_range)
 {
         assert(device);
         usb_log_debug("Disabling EHCI legacy support.\n");
 
-#define CHECK_RET_RETURN(ret, message...) \
-        if (ret != EOK) { \
-                usb_log_error(message); \
-                return ret; \
-        } else (void)0
-
         /* Map EHCI registers */
         void *regs = NULL;
-        int ret = pio_enable((void*)reg_base, reg_size, &regs);
-        CHECK_RET_RETURN(ret, "Failed to map registers %p: %s.\n",
-            (void *) reg_base, str_error(ret));
+        int rc = pio_enable_range(reg_range, &regs);
+        if (rc != EOK) {
+                usb_log_error("Failed to map registers %p: %s.\n",
+                    RNGABSPTR(*reg_range), str_error(rc));
+                return rc;
+        }
 
         usb_log_debug2("Registers mapped at: %p.\n", regs);
@@ -263 +290 @@
         usb_log_debug("Value of EECP: %x.\n", eecp);
 
-        ret = disable_extended_caps(device, eecp);
-        CHECK_RET_RETURN(ret, "Failed to disable extended capabilities: %s.\n",
-            str_error(ret));
-
-#undef CHECK_RET_RETURN
+        rc = disable_extended_caps(device, eecp);
+        if (rc != EOK) {
+                usb_log_error("Failed to disable extended capabilities: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
 
         /*
@@ -306 +334 @@
             usbcmd, *usbcmd, usbsts, *usbsts, usbint, *usbint, usbconf,*usbconf);
 
-        return ret;
+        return rc;
 }