Changeset a0be5d0 in mainline

Timestamp:

2017-10-09T14:11:22Z (8 years ago)

Author:

Michal Staruch <salmelu@…>

Branches:

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

Children:

42bc933

Parents:

ae03552e

Message:

Moved ring_doorbell, added address check

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (3 diffs)
• hc.c (modified) (2 diffs)
• hc.h (modified) (1 diff)
• transfers.c (modified) (3 diffs)

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

@@ -145 +145 @@
 }
 
-static inline int ring_doorbell(xhci_hc_t *hc, unsigned doorbell, unsigned target)
-{
-        assert(hc);
-        uint32_t v = host2xhci(32, target & BIT_RRANGE(uint32_t, 7));
-        pio_write_32(&hc->db_arry[doorbell], v);
-        return EOK;
-}
-
 static inline int enqueue_command(xhci_hc_t *hc, xhci_cmd_t *cmd, unsigned doorbell, unsigned target)
 {
@@ -161 +153 @@
 
         xhci_trb_ring_enqueue(&hc->command_ring, &cmd->trb, &cmd->trb_phys);
-        ring_doorbell(hc, doorbell, target);
+        hc_ring_doorbell(hc, doorbell, target);
 
         usb_log_debug2("HC(%p): Sent command:", hc);
@@ -196 +188 @@
 
         XHCI_REG_WR(hc->op_regs, XHCI_OP_CRR, 1);
-        ring_doorbell(hc, 0, 0);
+        hc_ring_doorbell(hc, 0, 0);
 }
 

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

@@ -457 +457 @@
                 batch->buffer_size);
 
+        if (!batch->ep->address) {
+                usb_log_error("Attempted to schedule transfer to address 0.");
+                return EINVAL;
+        }
+
         switch (batch->ep->transfer_type) {
         case USB_TRANSFER_CONTROL:
@@ -616 +621 @@
 }
 
-
+int hc_ring_doorbell(xhci_hc_t *hc, unsigned doorbell, unsigned target)
+{
+        assert(hc);
+        uint32_t v = host2xhci(32, target & BIT_RRANGE(uint32_t, 7));
+        pio_write_32(&hc->db_arry[doorbell], v);
+        return EOK;
+}
 
 /**

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

@@ -90 +90 @@
 void hc_interrupt(xhci_hc_t *, uint32_t);
 void hc_fini(xhci_hc_t *);
+int hc_ring_doorbell(xhci_hc_t *, unsigned, unsigned);
 
 #endif

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

@@ -41 +41 @@
 #include "trb_ring.h"
 
-static inline int ring_doorbell(xhci_hc_t *hc, unsigned doorbell, unsigned target)
-{
-        assert(hc);
-        uint32_t v = host2xhci(32, target & BIT_RRANGE(uint32_t, 7));
-        pio_write_32(&hc->db_arry[doorbell], v);
-        return EOK;
-}
-
 static inline uint8_t get_transfer_type(xhci_trb_t* trb, uint8_t bmRequestType, uint16_t wLength)
 {
@@ -143 +135 @@
 {
         if (!batch->setup_size) {
+                usb_log_error("Missing setup packet for the control transfer.");
                 return EINVAL;
         }
         if (batch->ep->endpoint != 0 || batch->ep->transfer_type != USB_TRANSFER_CONTROL) {
                 /* This method only works for control transfers. */
+                usb_log_error("Attempted to schedule control transfer to non 0 endpoint.");
                 return EINVAL;
         }
@@ -223 +217 @@
 
         /* For control transfers, the target is always 1. */
-        ring_doorbell(hc, slot_id, 1);
+        hc_ring_doorbell(hc, slot_id, 1);
         return EOK;
 }