Changeset 7e5a12b in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2018-01-19T17:57:13Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

69b2dfee

Parents:

2833bb4

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-19 17:57:06)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-19 17:57:13)

Message:

xhci: make enable/disable slot symmetric

Previously, device slot context was allocated inside address_device,
complicating error paths.

File:

• uspace/drv/bus/usb/xhci/hc.c (modified) (5 diffs)

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

@@ -714 +714 @@
 
 /**
- * Issue an Enable Slot command, returning the obtained Slot ID.
- *
- * @param slot_id Pointer where to store the obtained Slot ID.
- */
-int hc_enable_slot(xhci_hc_t *hc, uint32_t *slot_id)
-{
-        assert(hc);
-
+ * Issue an Enable Slot command. Allocate memory for the slot and fill the
+ * DCBAA with the newly created slot.
+ */
+int hc_enable_slot(xhci_device_t *dev)
+{
         int err;
+        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
+
+        /* Prepare memory for the context */
+        if ((err = dma_buffer_alloc(&dev->dev_ctx, sizeof(xhci_device_ctx_t))))
+                return err;
+        memset(dev->dev_ctx.virt, 0, sizeof(xhci_device_ctx_t));
+
+        /* Get the slot number */
         xhci_cmd_t cmd;
         xhci_cmd_init(&cmd, XHCI_CMD_ENABLE_SLOT);
 
-        if ((err = xhci_cmd_sync(hc, &cmd))) {
-                goto end;
-        }
-
-        if (slot_id) {
-                *slot_id = cmd.slot_id;
-        }
-
-end:
+        err = xhci_cmd_sync(hc, &cmd);
+
+        /* Link them together */
+        if (err == EOK) {
+                dev->slot_id = cmd.slot_id;
+                hc->dcbaa[dev->slot_id] = host2xhci(64, dev->dev_ctx.phys);
+        }
+
         xhci_cmd_fini(&cmd);
         return err;
@@ -741 +745 @@
 /**
  * Issue a Disable Slot command for a slot occupied by device.
- *
- * Frees the device context
- */
-int hc_disable_slot(xhci_hc_t *hc, xhci_device_t *dev)
+ * Frees the device context.
+ */
+int hc_disable_slot(xhci_device_t *dev)
 {
         int err;
-        assert(hc);
+        xhci_hc_t * const hc = bus_to_hc(dev->base.bus);
 
         if ((err = xhci_cmd_sync_inline(hc, DISABLE_SLOT, .slot_id = dev->slot_id))) {
@@ -837 +840 @@
         }
 
-        /* Setup and register device context */
-        if (dma_buffer_alloc(&dev->dev_ctx, sizeof(xhci_device_ctx_t)))
-                goto err;
-        memset(dev->dev_ctx.virt, 0, sizeof(xhci_device_ctx_t));
-
-        hc->dcbaa[dev->slot_id] = host2xhci(64, dev->dev_ctx.phys);
-
         /* Issue configure endpoint command (sec 4.3.5). */
         dma_buffer_t ictx_dma_buf;
-        if ((err = create_configure_ep_input_ctx(dev, &ictx_dma_buf))) {
-                goto err_dev_ctx;
-        }
+        if ((err = create_configure_ep_input_ctx(dev, &ictx_dma_buf)))
+                return err;
         xhci_input_ctx_t *ictx = ictx_dma_buf.virt;
 
@@ -856 +851 @@
 
         /* Issue Address Device command. */
-        if ((err = xhci_cmd_sync_inline(hc, ADDRESS_DEVICE, .slot_id = dev->slot_id, .input_ctx = ictx_dma_buf))) {
-                goto err_dev_ctx;
-        }
+        if ((err = xhci_cmd_sync_inline(hc, ADDRESS_DEVICE, .slot_id = dev->slot_id, .input_ctx = ictx_dma_buf)))
+                return err;
 
         xhci_device_ctx_t *dev_ctx = dev->dev_ctx.virt;
@@ -865 +859 @@
 
         return EOK;
-
-err_dev_ctx:
-        hc->dcbaa[dev->slot_id] = 0;
-        dma_buffer_free(&dev->dev_ctx);
-err:
-        return err;
 }