Changeset 25251bb in mainline

Timestamp:

2017-10-26T08:38:53Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

928afc8d

Parents:

62558202

Message:

xhci: move pointer to hc from device to bus

Also, fixes the bug of hc ptr not set on tier 2+ device.

Location:

uspace/drv/bus/usb/xhci

Files:

• bus.c (modified) (3 diffs)
• bus.h (modified) (1 diff)
• endpoint.c (modified) (3 diffs)
• endpoint.h (modified) (2 diffs)
• rh.c (modified) (3 diffs)

uspace/drv/bus/usb/xhci/bus.c

@@ -266 +266 @@
 
         usb_log_info("Endpoint(%d:%d) registered to XHCI bus.", ep->device->address, ep->endpoint);
-        return xhci_device_add_endpoint(xhci_dev, xhci_ep);
+        return xhci_device_add_endpoint(bus->hc, xhci_dev, xhci_ep);
 }
 
@@ -278 +278 @@
         xhci_device_t *xhci_dev = xhci_device_get(ep->device);
         xhci_endpoint_t *xhci_ep = xhci_endpoint_get(ep);
-        const int res = xhci_device_remove_endpoint(xhci_dev, xhci_ep);
+        const int res = xhci_device_remove_endpoint(bus->hc, xhci_dev, xhci_ep);
         if (res != EOK)
                 return res;
@@ -396 +396 @@
                 return ENOMEM;
 
+        bus->hc = hc;
         bus->base.ops = xhci_bus_ops;
         bus->default_address_speed = USB_SPEED_MAX;

uspace/drv/bus/usb/xhci/bus.h

@@ -48 +48 @@
         bus_t base;             /**< Inheritance. Keep this first. */
 
+        xhci_hc_t *hc;                          /**< Pointer to managing HC (to issue commands) */
+
         xhci_device_t **devices_by_slot;        /**< Devices by Slot ID */
 

uspace/drv/bus/usb/xhci/endpoint.c

@@ -269 +269 @@
 }
 
-int xhci_device_add_endpoint(xhci_device_t *dev, xhci_endpoint_t *ep)
+int xhci_device_add_endpoint(xhci_hc_t *hc, xhci_device_t *dev, xhci_endpoint_t *ep)
 {
         assert(dev);
@@ -299 +299 @@
         xhci_setup_endpoint_context(ep, &ep_ctx);
 
-        return hc_add_endpoint(dev->hc, dev->slot_id, xhci_endpoint_index(ep), &ep_ctx);
-}
-
-int xhci_device_remove_endpoint(xhci_device_t *dev, xhci_endpoint_t *ep)
+        return hc_add_endpoint(hc, dev->slot_id, xhci_endpoint_index(ep), &ep_ctx);
+}
+
+int xhci_device_remove_endpoint(xhci_hc_t *hc, xhci_device_t *dev, xhci_endpoint_t *ep)
 {
         assert(&dev->base == ep->base.device);
@@ -320 +320 @@
 
         /* Drop the endpoint. */
-        if ((err = hc_drop_endpoint(dev->hc, dev->slot_id, xhci_endpoint_index(ep)))) {
+        if ((err = hc_drop_endpoint(hc, dev->slot_id, xhci_endpoint_index(ep)))) {
                 goto err;
         }

uspace/drv/bus/usb/xhci/endpoint.h

@@ -117 +117 @@
         uint8_t active_endpoint_count;
 
-        /** Need HC to schedule commands from bus callbacks. TODO: Move this elsewhere. */
-        xhci_hc_t *hc;
-
         /** Flag indicating whether the device is USB3 (it's USB2 otherwise). */
         bool usb3;
@@ -137 +134 @@
 void xhci_setup_endpoint_context(xhci_endpoint_t *, xhci_ep_ctx_t *);
 
-int xhci_device_add_endpoint(xhci_device_t *, xhci_endpoint_t *);
-int xhci_device_remove_endpoint(xhci_device_t *, xhci_endpoint_t *);
+int xhci_device_add_endpoint(xhci_hc_t *, xhci_device_t *, xhci_endpoint_t *);
+int xhci_device_remove_endpoint(xhci_hc_t *, xhci_device_t *, xhci_endpoint_t *);
 xhci_endpoint_t * xhci_device_get_endpoint(xhci_device_t *, usb_endpoint_t);
 

uspace/drv/bus/usb/xhci/rh.c

@@ -102 +102 @@
         const xhci_port_speed_t *port_speed = xhci_rh_get_port_speed(rh, port_id);
         xhci_device_t *xhci_dev = xhci_device_get(dev);
-        xhci_dev->hc = rh->hc;
         xhci_dev->usb3 = port_speed->major == 3;
         xhci_dev->rh_port = port_id;
@@ -363 +362 @@
 }
 
-static inline int get_hub_available_bandwidth(xhci_device_t* dev, uint8_t speed, xhci_port_bandwidth_ctx_t *ctx) {
+static inline int get_hub_available_bandwidth(xhci_hc_t *hc, xhci_device_t* dev, uint8_t speed, xhci_port_bandwidth_ctx_t *ctx) {
         // TODO: find a correct place for this function + API
         // We need speed, because a root hub device has both USB 2 and USB 3 speeds
@@ -383 +382 @@
 
         int err;
-        if ((err = xhci_cmd_sync(dev->hc, &cmd))) {
+        if ((err = xhci_cmd_sync(hc, &cmd))) {
                 goto end;
         }