proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-15 08:04:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xhci: fix control xfers

Browse Source 
Use the new, direct control transfer submission method instead of
bypassing the usb core by calling usb_device_handle_control directly.
The later fails for async control transfers.

This patch gets xhci + usb-host combo going.
This commit is contained in:
Gerd Hoffmann 2012-03-01 15:51:51 +01:00
parent 1b4b29a114
commit 2850ca9ed1
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/usb-xhci.c
View File

@ -1470,8 +1470,8 @@ static USBDevice *xhci_find_device(XHCIPort *port, uint8_t addr)
static int xhci_fire_ctl_transfer(XHCIState *xhci, XHCITransfer *xfer) static int xhci_fire_ctl_transfer(XHCIState *xhci, XHCITransfer *xfer)
{ {
XHCITRB *trb_setup, *trb_status; XHCITRB *trb_setup, *trb_status;
uint8_t bmRequestType, bRequest; uint8_t bmRequestType;
uint16_t wValue, wLength, wIndex; uint16_t wLength;
XHCIPort *port; XHCIPort *port;
USBDevice *dev; USBDevice *dev;
int ret; int ret;
@ -1508,9 +1508,6 @@ static int xhci_fire_ctl_transfer(XHCIState *xhci, XHCITransfer *xfer)
} }
bmRequestType = trb_setup->parameter; bmRequestType = trb_setup->parameter;
bRequest = trb_setup->parameter >> 8;
wValue = trb_setup->parameter >> 16;
wIndex = trb_setup->parameter >> 32;
wLength = trb_setup->parameter >> 48; wLength = trb_setup->parameter >> 48;
if (xfer->data && xfer->data_alloced < wLength) { if (xfer->data && xfer->data_alloced < wLength) {
@ -1537,12 +1534,12 @@ static int xhci_fire_ctl_transfer(XHCIState *xhci, XHCITransfer *xfer)
xfer->iso_xfer = false; xfer->iso_xfer = false;
xhci_setup_packet(xfer, dev); xhci_setup_packet(xfer, dev);
xfer->packet.parameter = trb_setup->parameter;
if (!xfer->in_xfer) { if (!xfer->in_xfer) {
xhci_xfer_data(xfer, xfer->data, wLength, 0, 1, 0); xhci_xfer_data(xfer, xfer->data, wLength, 0, 1, 0);
} }
ret = usb_device_handle_control(dev, &xfer->packet,
(bmRequestType << 8) | bRequest, ret = usb_handle_packet(dev, &xfer->packet);
wValue, wIndex, wLength, xfer->data);
xhci_complete_packet(xfer, ret); xhci_complete_packet(xfer, ret);
if (!xfer->running_async && !xfer->running_retry) { if (!xfer->running_async && !xfer->running_retry) {