Changeset 4a00bc9 in mainline

Timestamp:

2018-01-10T13:29:52Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

398a94c

Parents:

f92f6b1

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-10 13:28:21)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-10 13:29:52)

Message:

xhci: fix errors reported by clang

Asserts were unnecessary, because the transfer type is an enum.
DMAMEM_4GiB is an uintptr_t constant.
There shall be at least one ring segment, and clang cannot infer that.
TRBs shall be 16-byte aligned to take aligned pointers from it.

Location:

uspace

Files:

• drv/bus/usb/xhci/endpoint.c (modified) (1 diff)
• drv/bus/usb/xhci/hw_struct/trb.h (modified) (1 diff)
• drv/bus/usb/xhci/transfers.c (modified) (1 diff)
• drv/bus/usb/xhci/trb_ring.c (modified) (2 diffs)
• lib/usbhost/src/dma_buffer.c (modified) (1 diff)

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

@@ -429 +429 @@
 
         usb_transfer_type_t tt = ep->base.transfer_type;
-        assert(tt < ARRAY_SIZE(setup_ep_ctx_helpers));
 
         memset(ep_ctx, 0, sizeof(*ep_ctx));

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

@@ -96 +96 @@
         xhci_dword_t status;
         xhci_dword_t control;
-} __attribute__((packed)) xhci_trb_t;
+} __attribute__((packed)) __attribute__((aligned(16))) xhci_trb_t;
 
 #define TRB_TYPE(trb)           XHCI_DWORD_EXTRACT((trb).control, 15, 10)

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

@@ -341 +341 @@
 
         const usb_transfer_type_t type = batch->ep->transfer_type;
-        assert(type >= 0 && type < ARRAY_SIZE(transfer_handlers));
         assert(transfer_handlers[type]);
 

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

@@ -151 +151 @@
         if (!next_segment)
                 next_segment = list_first(&ring->segments);
+        assert(next_segment);
 
         ring->enqueue_segment = list_get_instance(next_segment, trb_segment_t, segments_link);
@@ -207 +208 @@
         xhci_trb_t *trb = first_trb;
         for (size_t i = 0; i < trbs; ++i, ++trb) {
-                if (trb_generates_interrupt(trb)) {
+                if (phys && trb_generates_interrupt(trb)) {
                         if (*phys)
                                 return ENOTSUP;

uspace/lib/usbhost/src/dma_buffer.c

@@ -62 +62 @@
         const size_t aligned_size = ALIGN_UP(size, policy.alignment);
         const size_t real_size = ALIGN_UP(aligned_size, PAGE_SIZE);
-        const int flags = policy.use64 ? 0 : DMAMEM_4GiB;
+        const uintptr_t flags = policy.use64 ? 0 : DMAMEM_4GiB;
 
         uintptr_t phys;