Changeset df6ded8 in mainline for uspace/drv/bus/usb/ehci/res.c

Timestamp:

2018-02-28T16:37:50Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (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.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

File:

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

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -45 +46 @@
 #include <pci_dev_iface.h>
 
+#include "hc.h"
 #include "res.h"
 #include "ehci_regs.h"
@@ -73 +75 @@
             eecp + USBLEGSUP_OFFSET, &usblegsup);
         if (ret != EOK) {
-                usb_log_error("Failed to read USBLEGSUP: %s.\n", str_error(ret));
-                return ret;
-        }
-        usb_log_debug2("USBLEGSUP: %" PRIx32 ".\n", usblegsup);
+                usb_log_error("Failed to read USBLEGSUP: %s.", str_error(ret));
+                return ret;
+        }
+        usb_log_debug2("USBLEGSUP: %" PRIx32 ".", usblegsup);
 
         /* Request control from firmware/BIOS by writing 1 to highest
          * byte. (OS Control semaphore)*/
-        usb_log_debug("Requesting OS control.\n");
+        usb_log_debug("Requesting OS control.");
         ret = pci_config_space_write_8(parent_sess,
             eecp + USBLEGSUP_OFFSET + 3, 1);
         if (ret != EOK) {
-                usb_log_error("Failed to request OS EHCI control: %s.\n",
+                usb_log_error("Failed to request OS EHCI control: %s.",
                     str_error(ret));
                 return ret;
@@ -102 +104 @@
 
         if ((usblegsup & USBLEGSUP_BIOS_CONTROL) == 0) {
-                usb_log_info("BIOS released control after %zu usec.\n", wait);
+                usb_log_info("BIOS released control after %zu usec.", wait);
                 return EOK;
         }
@@ -108 +110 @@
         /* BIOS failed to hand over control, this should not happen. */
         usb_log_warning( "BIOS failed to release control after "
-            "%zu usecs, force it.\n", wait);
+            "%zu usecs, force it.", wait);
         ret = pci_config_space_write_32(parent_sess,
             eecp + USBLEGSUP_OFFSET, USBLEGSUP_OS_CONTROL);
         if (ret != EOK) {
-                usb_log_error("Failed to force OS control: %s.\n",
+                usb_log_error("Failed to force OS control: %s.",
                     str_error(ret));
                 return ret;
@@ -129 +131 @@
                     eecp + USBLEGCTLSTS_OFFSET, &usblegctlsts);
                 if (ret != EOK) {
-                        usb_log_error("Failed to get USBLEGCTLSTS: %s.\n",
+                        usb_log_error("Failed to get USBLEGCTLSTS: %s.",
                             str_error(ret));
                         return ret;
                 }
-                usb_log_debug2("USBLEGCTLSTS: %" PRIx32 ".\n", usblegctlsts);
+                usb_log_debug2("USBLEGCTLSTS: %" PRIx32 ".", usblegctlsts);
                 /*
                  * Zero SMI enables in legacy control register.
@@ -142 +144 @@
                     eecp + USBLEGCTLSTS_OFFSET, 0xe0000000);
                 if (ret != EOK) {
-                        usb_log_error("Failed to zero USBLEGCTLSTS: %s\n",
+                        usb_log_error("Failed to zero USBLEGCTLSTS: %s",
                             str_error(ret));
                         return ret;
@@ -152 +154 @@
                     eecp + USBLEGCTLSTS_OFFSET, &usblegctlsts);
                 if (ret != EOK) {
-                        usb_log_error("Failed to get USBLEGCTLSTS 2: %s.\n",
+                        usb_log_error("Failed to get USBLEGCTLSTS 2: %s.",
                             str_error(ret));
                         return ret;
                 }
-                usb_log_debug2("Zeroed USBLEGCTLSTS: %" PRIx32 ".\n",
+                usb_log_debug2("Zeroed USBLEGCTLSTS: %" PRIx32 ".",
                     usblegctlsts);
         }
@@ -164 +166 @@
             eecp + USBLEGSUP_OFFSET, &usblegsup);
         if (ret != EOK) {
-                usb_log_error("Failed to read USBLEGSUP: %s.\n",
-                    str_error(ret));
-                return ret;
-        }
-        usb_log_debug2("USBLEGSUP: %" PRIx32 ".\n", usblegsup);
+                usb_log_error("Failed to read USBLEGSUP: %s.",
+                    str_error(ret));
+                return ret;
+        }
+        usb_log_debug2("USBLEGSUP: %" PRIx32 ".", usblegsup);
         return ret;
 }
 
-errno_t disable_legacy(ddf_dev_t *device)
+errno_t disable_legacy(hc_device_t *hcd)
 {
-        assert(device);
-
-        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
+        hc_t *hc = hcd_to_hc(hcd);
+
+        async_sess_t *parent_sess = ddf_dev_parent_sess_get(hcd->ddf_dev);
         if (parent_sess == NULL)
                 return ENOMEM;
 
-        usb_log_debug("Disabling EHCI legacy support.\n");
-
-        hw_res_list_parsed_t res;
-        hw_res_list_parsed_init(&res);
-        errno_t ret = hw_res_get_list_parsed(parent_sess, &res, 0);
-        if (ret != EOK) {
-                usb_log_error("Failed to get resource list: %s\n",
-                    str_error(ret));
-                goto clean;
-        }
-
-        if (res.mem_ranges.count < 1) {
-                usb_log_error("Incorrect mem range count: %zu",
-                    res.mem_ranges.count);
-                ret = EINVAL;
-                goto clean;
-        }
-
-        /* Map EHCI registers */
-        void *regs = NULL;
-        ret = pio_enable_range(&res.mem_ranges.ranges[0], &regs);
-        if (ret != EOK) {
-                usb_log_error("Failed to map registers %p: %s.\n",
-                    RNGABSPTR(res.mem_ranges.ranges[0]), str_error(ret));
-                goto clean;
-        }
-
-        usb_log_debug("Registers mapped at: %p.\n", regs);
-
-        ehci_caps_regs_t *ehci_caps = regs;
-
-        const uint32_t hcc_params = EHCI_RD(ehci_caps->hccparams);
-        usb_log_debug2("Value of hcc params register: %x.\n", hcc_params);
+        usb_log_debug("Disabling EHCI legacy support.");
+
+        const uint32_t hcc_params = EHCI_RD(hc->caps->hccparams);
+        usb_log_debug2("Value of hcc params register: %x.", hcc_params);
 
         /* Read value of EHCI Extended Capabilities Pointer
@@ -218 +191 @@
         const uint32_t eecp =
             (hcc_params >> EHCI_CAPS_HCC_EECP_SHIFT) & EHCI_CAPS_HCC_EECP_MASK;
-        usb_log_debug2("Value of EECP: %x.\n", eecp);
-
-        ret = disable_extended_caps(parent_sess, eecp);
-        if (ret != EOK) {
-                usb_log_error("Failed to disable extended capabilities: %s.\n",
+        usb_log_debug2("Value of EECP: %x.", eecp);
+
+        int ret = disable_extended_caps(parent_sess, eecp);
+        if (ret != EOK) {
+                usb_log_error("Failed to disable extended capabilities: %s.",
                     str_error(ret));
                     goto clean;
         }
 clean:
-        //TODO unmap registers
-        hw_res_list_parsed_clean(&res);
+        async_hangup(parent_sess);
         return ret;
 }