diff options
| author | Michael Brown <mcb30@ipxe.org> | 2015-02-10 13:45:57 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2015-02-10 13:49:27 +0000 |
| commit | 58c3e7f74771dd4748983cc47ed53241ac1864f1 (patch) | |
| tree | e5baedb5b58a1abadf5ea3811fa66e87d14d40d7 /src/drivers/usb/xhci.c | |
| parent | 17aceb34da3bad166cab8579a3616806fff8e05b (diff) | |
| download | ipxe-58c3e7f74771dd4748983cc47ed53241ac1864f1.tar.gz | |
[usb] Allow usb_stream() to enforce a terminating short packet
Some USB endpoints require that a short packet be used to terminate
transfers, since they have no other way to determine message
boundaries. If the message length happens to be an exact multiple of
the USB packet size, then this requires the use of an additional
zero-length packet.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/drivers/usb/xhci.c')
| -rw-r--r-- | src/drivers/usb/xhci.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/drivers/usb/xhci.c b/src/drivers/usb/xhci.c index 49901275..bf8cf1c8 100644 --- a/src/drivers/usb/xhci.c +++ b/src/drivers/usb/xhci.c @@ -2457,27 +2457,37 @@ static int xhci_endpoint_message ( struct usb_endpoint *ep, * * @v ep USB endpoint * @v iobuf I/O buffer + * @v terminate Terminate using a short packet * @ret rc Return status code */ static int xhci_endpoint_stream ( struct usb_endpoint *ep, - struct io_buffer *iobuf ) { + struct io_buffer *iobuf, int terminate ) { struct xhci_endpoint *endpoint = usb_endpoint_get_hostdata ( ep ); - union xhci_trb trb; + union xhci_trb trbs[ 1 /* Normal */ + 1 /* Possible zero-length */ ]; + union xhci_trb *trb = trbs; struct xhci_trb_normal *normal; + size_t len = iob_len ( iobuf ); int rc; /* Profile stream transfers */ profile_start ( &xhci_stream_profiler ); /* Construct normal TRBs */ - normal = &trb.normal; + memset ( &trbs, 0, sizeof ( trbs ) ); + normal = &(trb++)->normal; normal->data = cpu_to_le64 ( virt_to_phys ( iobuf->data ) ); - normal->len = cpu_to_le32 ( iob_len ( iobuf ) ); - normal->flags = XHCI_TRB_IOC; + normal->len = cpu_to_le32 ( len ); normal->type = XHCI_TRB_NORMAL; + if ( terminate && ( ( len & ( ep->mtu - 1 ) ) == 0 ) ) { + normal->flags = XHCI_TRB_CH; + normal = &(trb++)->normal; + normal->type = XHCI_TRB_NORMAL; + } + normal->flags = XHCI_TRB_IOC; /* Enqueue TRBs */ - if ( ( rc = xhci_enqueue ( &endpoint->ring, iobuf, &trb ) ) != 0 ) + if ( ( rc = xhci_enqueue_multi ( &endpoint->ring, iobuf, trbs, + ( trb - trbs ) ) ) != 0 ) return rc; /* Ring the doorbell */ |