usb patch queue
Hi,
Nothing major. Cleanups, bugfixes, xhci emulation improvements.
please pull,
Gerd
The following changes since commit 46eef33b89e936ca793e13c4aeea1414e97e8dbb:
Fix QEMU build on OpenBSD on x86 archs (2014-02-17 11:44:00 +0000)
are available in the git repository at:
git://git.kraxel.org/qemu tags/pull-usb-3
for you to fetch changes up to d6bb65fcd24c8cb8c37ffe324c360f3b0c94b902:
xhci: use DPRINTF() instead of fprintf(stderr, ...) (2014-02-18 15:39:13 +0100)
----------------------------------------------------------------
- xhci improvements and fixes.
- uhci bugfix.
- cleanups.
----------------------------------------------------------------
Gerd Hoffmann (6):
xhci: fix overflow in usb_xhci_post_load
uhci: invalidate queue on device address changes xhci iso: fix time calculation
xhci iso: allow for some latency
xhci: switch debug printf to tracepoint
xhci: use DPRINTF() instead of fprintf(stderr, ...)
Pantelis Koukousoulas (1):
usb: Remove magic constants from device bmAttributes
hw/usb/desc.c | 2 +- hw/usb/dev-audio.c | 2 +- hw/usb/dev-bluetooth.c | 2 +- hw/usb/dev-hid.c | 8 ++-- hw/usb/dev-hub.c | 3 +- hw/usb/dev-network.c | 4 +- hw/usb/dev-serial.c | 2 +- hw/usb/dev-smartcard-reader.c | 3 +- hw/usb/dev-storage.c | 6 +-- hw/usb/dev-uas.c | 4 +- hw/usb/dev-wacom.c | 2 +- hw/usb/hcd-uhci.c | 2 + hw/usb/hcd-xhci.c | 102 +++++++++++++++++++++--------------------- include/hw/usb.h | 5 +++ 14 files changed, 77 insertions(+), 70 deletions(-)
PATCH 1/7 usb: Remove magic constants from device bmAttributes
From: Pantelis Koukousoulas <[email protected]>
Replace magic constants in device bmAttributes with symbolic ones from Linux kernel ch9.h
--- hw/usb/desc.c | 2 +- hw/usb/dev-audio.c | 2 +- hw/usb/dev-bluetooth.c | 2 +- hw/usb/dev-hid.c | 8 ++++---- hw/usb/dev-hub.c | 3 ++- hw/usb/dev-network.c | 4 ++-- hw/usb/dev-serial.c | 2 +- hw/usb/dev-smartcard-reader.c | 3 ++- hw/usb/dev-storage.c | 6 +++--- hw/usb/dev-uas.c | 4 ++-- hw/usb/dev-wacom.c | 2 +- include/hw/usb.h | 5 +++++ 12 files changed, 25 insertions(+), 18 deletions(-)
hw/usb/desc.c +1 -1
@@ -759,7 +759,7 @@ int usb_desc_handle_control(USBDevice *dev, USBPacket *p,* We return the same value that a configured device would return if * it used the first configuration. */ -if (config->bmAttributes &0x40 ) { +if (config->bmAttributes &USB_CFG_ATT_SELFPOWER ) { data[0 ] |=1 <<USB_DEVICE_SELF_POWERED ; }if (dev->remote_wakeup) {
hw/usb/dev-audio.c +1 -1
@@ -224,7 +224,7 @@ static const USBDescDevice desc_device = { .bNumInterfaces = 2, .bConfigurationValue = DEV_CONFIG_VALUE, .iConfiguration = STRING_CONFIG, - .bmAttributes = 0xc0, + .bmAttributes = USB_CFG_ATT_ONE | USB_CFG_ATT_SELFPOWER, .bMaxPower = 0x32, .nif = ARRAY_SIZE(desc_iface), .ifs = desc_iface,
hw/usb/dev-bluetooth.c +1 -1
@@ -229,7 +229,7 @@ static const USBDescDevice desc_device_bluetooth = { { .bNumInterfaces = 2, .bConfigurationValue = 1, - .bmAttributes = 0xc0, + .bmAttributes = USB_CFG_ATT_ONE | USB_CFG_ATT_SELFPOWER, .bMaxPower = 0, .nif = ARRAY_SIZE(desc_iface_bluetooth), .ifs = desc_iface_bluetooth,
hw/usb/dev-hid.c +4 -4
@@ -202,7 +202,7 @@ static const USBDescDevice desc_device_mouse = { .bNumInterfaces = 1, .bConfigurationValue = 1, .iConfiguration = STR_CONFIG_MOUSE, - .bmAttributes = 0xa0, + .bmAttributes = USB_CFG_ATT_ONE | USB_CFG_ATT_WAKEUP, .bMaxPower = 50, .nif = 1, .ifs = &desc_iface_mouse,
@@ -219,7 +219,7 @@ static const USBDescDevice desc_device_tablet = { .bNumInterfaces = 1, .bConfigurationValue = 1, .iConfiguration = STR_CONFIG_TABLET, - .bmAttributes = 0xa0, + .bmAttributes = USB_CFG_ATT_ONE | USB_CFG_ATT_WAKEUP, .bMaxPower = 50, .nif = 1, .ifs = &desc_iface_tablet,
@@ -236,7 +236,7 @@ static const USBDescDevice desc_device_tablet2 = { .bNumInterfaces = 1, .bConfigurationValue = 1, .iConfiguration = STR_CONFIG_TABLET, - .bmAttributes = 0xa0, + .bmAttributes = USB_CFG_ATT_ONE | USB_CFG_ATT_WAKEUP, .bMaxPower = 50, .nif = 1, .ifs = &desc_iface_tablet2,
@@ -253,7 +253,7 @@ static const USBDescDevice desc_device_keyboard = { .bNumInterfaces = 1, .bConfigurationValue = 1, .iConfiguration = STR_CONFIG_KEYBOARD, - .bmAttributes = 0xa0, + .bmAttributes = USB_CFG_ATT_ONE | USB_CFG_ATT_WAKEUP, .bMaxPower = 50, .nif = 1, .ifs = &desc_iface_keyboard,
hw/usb/dev-hub.c +2 -1
@@ -119,7 +119,8 @@ static const USBDescDevice desc_device_hub = { { .bNumInterfaces = 1, .bConfigurationValue = 1, - .bmAttributes = 0xe0, + .bmAttributes =USB_CFG_ATT_ONE |USB_CFG_ATT_SELFPOWER | + USB_CFG_ATT_WAKEUP, .nif = 1, .ifs = &desc_iface_hub, },
hw/usb/dev-network.c +2 -2
@@ -266,7 +266,7 @@ static const USBDescDevice desc_device_net = { .bNumInterfaces = 2, .bConfigurationValue = DEV_RNDIS_CONFIG_VALUE, .iConfiguration = STRING_RNDIS, - .bmAttributes = 0xc0, + .bmAttributes = USB_CFG_ATT_ONE | USB_CFG_ATT_SELFPOWER, .bMaxPower = 0x32, .nif = ARRAY_SIZE(desc_iface_rndis), .ifs = desc_iface_rndis,
@@ -274,7 +274,7 @@ static const USBDescDevice desc_device_net = { .bNumInterfaces = 2, .bConfigurationValue = DEV_CONFIG_VALUE, .iConfiguration = STRING_CDC, - .bmAttributes = 0xc0, + .bmAttributes = USB_CFG_ATT_ONE | USB_CFG_ATT_SELFPOWER, .bMaxPower = 0x32, .nif = ARRAY_SIZE(desc_iface_cdc), .ifs = desc_iface_cdc,
hw/usb/dev-serial.c +1 -1
@@ -144,7 +144,7 @@ static const USBDescDevice desc_device = { { .bNumInterfaces = 1, .bConfigurationValue = 1, - .bmAttributes = 0x80, + .bmAttributes = USB_CFG_ATT_ONE, .bMaxPower = 50, .nif = 1, .ifs = &desc_iface0,
hw/usb/dev-smartcard-reader.c +2 -1
@@ -463,7 +463,8 @@ static const USBDescDevice desc_device = { { .bNumInterfaces = 1, .bConfigurationValue = 1, - .bmAttributes = 0xe0, + .bmAttributes =USB_CFG_ATT_ONE |USB_CFG_ATT_SELFPOWER | + USB_CFG_ATT_WAKEUP, .bMaxPower = 50, .nif = 1, .ifs = &desc_iface0,
hw/usb/dev-storage.c +3 -3
@@ -117,7 +117,7 @@ static const USBDescDevice desc_device_full = { .bNumInterfaces = 1, .bConfigurationValue = 1, .iConfiguration = STR_CONFIG_FULL, - .bmAttributes = 0xc0, + .bmAttributes = USB_CFG_ATT_ONE | USB_CFG_ATT_SELFPOWER, .nif = 1, .ifs = &desc_iface_full, },
@@ -152,7 +152,7 @@ static const USBDescDevice desc_device_high = { .bNumInterfaces = 1, .bConfigurationValue = 1, .iConfiguration = STR_CONFIG_HIGH, - .bmAttributes = 0xc0, + .bmAttributes = USB_CFG_ATT_ONE | USB_CFG_ATT_SELFPOWER, .nif = 1, .ifs = &desc_iface_high, },
@@ -189,7 +189,7 @@ static const USBDescDevice desc_device_super = { .bNumInterfaces = 1, .bConfigurationValue = 1, .iConfiguration = STR_CONFIG_SUPER, - .bmAttributes = 0xc0, + .bmAttributes = USB_CFG_ATT_ONE | USB_CFG_ATT_SELFPOWER, .nif = 1, .ifs = &desc_iface_super, },
hw/usb/dev-uas.c +2 -2
@@ -286,7 +286,7 @@ static const USBDescDevice desc_device_high = { .bNumInterfaces = 1, .bConfigurationValue = 1, .iConfiguration = STR_CONFIG_HIGH, - .bmAttributes = 0xc0, + .bmAttributes = USB_CFG_ATT_ONE | USB_CFG_ATT_SELFPOWER, .nif = 1, .ifs = &desc_iface_high, },
@@ -302,7 +302,7 @@ static const USBDescDevice desc_device_super = { .bNumInterfaces = 1, .bConfigurationValue = 1, .iConfiguration = STR_CONFIG_SUPER, - .bmAttributes = 0xc0, + .bmAttributes = USB_CFG_ATT_ONE | USB_CFG_ATT_SELFPOWER, .nif = 1, .ifs = &desc_iface_super, },
hw/usb/dev-wacom.c +1 -1
@@ -107,7 +107,7 @@ static const USBDescDevice desc_device_wacom = { { .bNumInterfaces = 1, .bConfigurationValue = 1, - .bmAttributes = 0x80, + .bmAttributes = USB_CFG_ATT_ONE, .bMaxPower = 40, .nif = 1, .ifs = &desc_iface_wacom,
include/hw/usb.h +5 -0
@@ -157,6 +157,11 @@#define USB_DEV_CAP_USB2_EXT 0x02#define USB_DEV_CAP_SUPERSPEED 0x03 +#define USB_CFG_ATT_ONE (1 << 7)/* should always be set */ +#define USB_CFG_ATT_SELFPOWER (1 << 6) +#define USB_CFG_ATT_WAKEUP (1 << 5) +#define USB_CFG_ATT_BATTERY (1 << 4) +#define USB_ENDPOINT_XFER_CONTROL 0#define USB_ENDPOINT_XFER_ISOC 1#define USB_ENDPOINT_XFER_BULK 2
Signature · 1 line
1.8.3.1
PATCH 2/7 xhci: fix overflow in usb_xhci_post_load
In reply to Gerd HoffmannFound by Coverity.
--- hw/usb/hcd-xhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/usb/hcd-xhci.c +1 -1
@@ -3636,7 +3636,7 @@ static int usb_xhci_post_load(void *opaque, int version_id) slot->uport =xhci_lookup_uport (xhci, slot_ctx);assert (slot->uport && slot->uport->dev); -for (epid =1 ; epid <=32 ; epid++) { +for (epid =1 ; epid <=31 ; epid++) { pctx = slot->ctx +32 * epid;xhci_dma_read_u32s (xhci, pctx, ep_ctx,sizeof (ep_ctx)); state = ep_ctx[0 ] &EP_STATE_MASK ;
Signature · 1 line
1.8.3.1
PATCH 3/7 uhci: invalidate queue on device address changes
In reply to Gerd Hoffmann--- hw/usb/hcd-uhci.c | 2 ++ 1 file changed, 2 insertions(+)
hw/usb/hcd-uhci.c +2 -0
@@ -252,9 +252,11 @@ static bool uhci_queue_verify(UHCIQueue *queue, uint32_t qh_addr, UHCI_TD *td, uint32_t td_addr, bool queuing) {UHCIAsync *first =QTAILQ_FIRST (&queue->asyncs); +uint32_t queue_token_addr = (queue->token >>8 ) &0x7f ;return queue->qh_addr == qh_addr && queue->token ==uhci_queue_token (td) && + queue_token_addr == queue->ep->dev->addr && (queuing || !(td->ctrl &TD_CTRL_ACTIVE ) || first ==NULL || first->td_addr == td_addr); }
Signature · 1 line
1.8.3.1
PATCH 4/7 xhci iso: fix time calculation
In reply to Gerd HoffmannFrameid specifies frames not microframes, so we
need to shift it to get the microframe index.
--- hw/usb/hcd-xhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/usb/hcd-xhci.c +2 -2
@@ -1974,8 +1974,8 @@ static void xhci_calc_iso_kick(XHCIState *xhci, XHCITransfer *xfer, xfer->mfindex_kick = asap; } }else { - xfer->mfindex_kick = (xfer->trbs[0 ].control >>TRB_TR_FRAMEID_SHIFT ) - &TRB_TR_FRAMEID_MASK ; + xfer->mfindex_kick = ((xfer->trbs[0 ].control >>TRB_TR_FRAMEID_SHIFT ) + &TRB_TR_FRAMEID_MASK ) <<3 ; xfer->mfindex_kick |= mfindex & ~0x3fff ;if (xfer->mfindex_kick < mfindex) { xfer->mfindex_kick +=0x4000 ;
Signature · 1 line
1.8.3.1
PATCH 5/7 xhci iso: allow for some latency
In reply to Gerd HoffmannAllow the scheduled transfer time be a bit behind, to compensate for latencies. Without this xhci will wait way to often for the mfindex wraparound, assuming the scheduled time is in the future just because qemu is a bit behind in processing the iso transfer requests.
--- hw/usb/hcd-xhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/usb/hcd-xhci.c +1 -1
@@ -1977,7 +1977,7 @@ static void xhci_calc_iso_kick(XHCIState *xhci, XHCITransfer *xfer, xfer->mfindex_kick = ((xfer->trbs[0 ].control >>TRB_TR_FRAMEID_SHIFT ) &TRB_TR_FRAMEID_MASK ) <<3 ; xfer->mfindex_kick |= mfindex & ~0x3fff ; -if (xfer->mfindex_kick < mfindex) { +if (xfer->mfindex_kick +0x100 < mfindex) { xfer->mfindex_kick +=0x4000 ; } }
Signature · 1 line
1.8.3.1
PATCH 6/7 xhci: switch debug printf to tracepoint
In reply to Gerd Hoffmann--- hw/usb/hcd-xhci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
hw/usb/hcd-xhci.c +1 -3
@@ -2038,9 +2038,7 @@ static int xhci_submit(XHCIState *xhci, XHCITransfer *xfer, XHCIEPContext *epctx }break ;default : -fprintf (stderr,"xhci: unknown or unhandled EP " -"(type %d, in %d, ep %02x)\n" , - epctx->type, xfer->in_xfer, xfer->epid); +trace_usb_xhci_unimplemented ("endpoint type" , epctx->type);return -1 ; }
Signature · 1 line
1.8.3.1
PATCH 7/7 xhci: use DPRINTF() instead of fprintf(stderr, ...)
In reply to Gerd HoffmannSo we don't spam stderr with (guest-triggerable) messages by default.
--- hw/usb/hcd-xhci.c | 90 +++++++++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 45 deletions(-)
hw/usb/hcd-xhci.c +45 -45
@@ -807,7 +807,7 @@ static inline int xhci_running(XHCIState *xhci)static void xhci_die (XHCIState *xhci) { xhci->usbsts |=USBSTS_HCE ; -fprintf (stderr,"xhci: asserted controller error\n" ); +DPRINTF ("xhci: asserted controller error\n" ); }static void xhci_write_event (XHCIState *xhci,XHCIEvent *event,int v)
@@ -854,8 +854,8 @@ static void xhci_events_update(XHCIState *xhci, int v) erdp =xhci_addr64 (intr->erdp_low, intr->erdp_high);if (erdp < intr->er_start || erdp >= (intr->er_start +TRB_SIZE *intr->er_size)) { -fprintf (stderr,"xhci: ERDP out of bounds: " DMA_ADDR_FMT "\n" , erdp); -fprintf (stderr,"xhci: ER[%d] at " DMA_ADDR_FMT " len %d\n" , +DPRINTF ("xhci: ERDP out of bounds: " DMA_ADDR_FMT "\n" , erdp); +DPRINTF ("xhci: ER[%d] at " DMA_ADDR_FMT " len %d\n" , v, intr->er_start, intr->er_size);xhci_die (xhci);return ;
@@ -923,7 +923,7 @@ static void xhci_event(XHCIState *xhci, XHCIEvent *event, int v)if (intr->er_full) {DPRINTF ("xhci_event(): ER full, queueing\n" );if (((intr->ev_buffer_put+1 ) %EV_QUEUE ) == intr->ev_buffer_get) { -fprintf (stderr,"xhci: event queue full, dropping event!\n" ); +DPRINTF ("xhci: event queue full, dropping event!\n" );return ; } intr->ev_buffer[intr->ev_buffer_put++] = *event;
@@ -936,8 +936,8 @@ static void xhci_event(XHCIState *xhci, XHCIEvent *event, int v) erdp =xhci_addr64 (intr->erdp_low, intr->erdp_high);if (erdp < intr->er_start || erdp >= (intr->er_start +TRB_SIZE *intr->er_size)) { -fprintf (stderr,"xhci: ERDP out of bounds: " DMA_ADDR_FMT "\n" , erdp); -fprintf (stderr,"xhci: ER[%d] at " DMA_ADDR_FMT " len %d\n" , +DPRINTF ("xhci: ERDP out of bounds: " DMA_ADDR_FMT "\n" , erdp); +DPRINTF ("xhci: ER[%d] at " DMA_ADDR_FMT " len %d\n" , v, intr->er_start, intr->er_size);xhci_die (xhci);return ;
@@ -954,7 +954,7 @@ static void xhci_event(XHCIState *xhci, XHCIEvent *event, int v)#endif intr->er_full =1 ;if (((intr->ev_buffer_put+1 ) %EV_QUEUE ) == intr->ev_buffer_get) { -fprintf (stderr,"xhci: event queue full, dropping event!\n" ); +DPRINTF ("xhci: event queue full, dropping event!\n" );return ; } intr->ev_buffer[intr->ev_buffer_put++] = *event;
@@ -1072,7 +1072,7 @@ static void xhci_er_reset(XHCIState *xhci, int v) }/* cache the (sole) event ring segment location */ if (intr->erstsz !=1 ) { -fprintf (stderr,"xhci: invalid value for ERSTSZ: %d\n" , intr->erstsz); +DPRINTF ("xhci: invalid value for ERSTSZ: %d\n" , intr->erstsz);xhci_die (xhci);return ; }
@@ -1082,7 +1082,7 @@ static void xhci_er_reset(XHCIState *xhci, int v)le32_to_cpus (&seg.addr_high);le32_to_cpus (&seg.size);if (seg.size <16 || seg.size >4096 ) { -fprintf (stderr,"xhci: invalid value for segment size: %d\n" , seg.size); +DPRINTF ("xhci: invalid value for segment size: %d\n" , seg.size);xhci_die (xhci);return ; }
@@ -1248,7 +1248,7 @@ static TRBCCode xhci_alloc_device_streams(XHCIState *xhci, unsigned int slotid, r =usb_device_alloc_streams (eps[0 ]->dev, eps, nr_eps, req_nr_streams);if (r !=0 ) { -fprintf (stderr,"xhci: alloc streams failed\n" ); +DPRINTF ("xhci: alloc streams failed\n" );return CC_RESOURCE_ERROR ; }
@@ -1532,7 +1532,7 @@ static TRBCCode xhci_stop_ep(XHCIState *xhci, unsigned int slotid,assert (slotid >=1 && slotid <= xhci->numslots);if (epid <1 || epid >31 ) { -fprintf (stderr,"xhci: bad ep %d\n" , epid); +DPRINTF ("xhci: bad ep %d\n" , epid);return CC_TRB_ERROR ; }
@@ -1544,7 +1544,7 @@ static TRBCCode xhci_stop_ep(XHCIState *xhci, unsigned int slotid, }if (xhci_ep_nuke_xfers (xhci, slotid, epid,CC_STOPPED ) >0 ) { -fprintf (stderr,"xhci: FIXME: endpoint stopped w/ xfers running, " +DPRINTF ("xhci: FIXME: endpoint stopped w/ xfers running, " "data might be lost\n" ); }
@@ -1569,7 +1569,7 @@ static TRBCCode xhci_reset_ep(XHCIState *xhci, unsigned int slotid,assert (slotid >=1 && slotid <= xhci->numslots);if (epid <1 || epid >31 ) { -fprintf (stderr,"xhci: bad ep %d\n" , epid); +DPRINTF ("xhci: bad ep %d\n" , epid);return CC_TRB_ERROR ; }
@@ -1583,13 +1583,13 @@ static TRBCCode xhci_reset_ep(XHCIState *xhci, unsigned int slotid, epctx = slot->eps[epid-1 ];if (epctx->state !=EP_HALTED ) { -fprintf (stderr,"xhci: reset EP while EP %d not halted (%d)\n" , +DPRINTF ("xhci: reset EP while EP %d not halted (%d)\n" , epid, epctx->state);return CC_CONTEXT_STATE_ERROR ; }if (xhci_ep_nuke_xfers (xhci, slotid, epid,0 ) >0 ) { -fprintf (stderr,"xhci: FIXME: endpoint reset w/ xfers running, " +DPRINTF ("xhci: FIXME: endpoint reset w/ xfers running, " "data might be lost\n" ); }
@@ -1626,7 +1626,7 @@ static TRBCCode xhci_set_ep_dequeue(XHCIState *xhci, unsigned int slotid,assert (slotid >=1 && slotid <= xhci->numslots);if (epid <1 || epid >31 ) { -fprintf (stderr,"xhci: bad ep %d\n" , epid); +DPRINTF ("xhci: bad ep %d\n" , epid);return CC_TRB_ERROR ; }
@@ -1643,7 +1643,7 @@ static TRBCCode xhci_set_ep_dequeue(XHCIState *xhci, unsigned int slotid, epctx = slot->eps[epid-1 ];if (epctx->state !=EP_STOPPED ) { -fprintf (stderr,"xhci: set EP dequeue pointer while EP %d not stopped\n" , epid); +DPRINTF ("xhci: set EP dequeue pointer while EP %d not stopped\n" , epid);return CC_CONTEXT_STATE_ERROR ; }
@@ -1685,7 +1685,7 @@ static int xhci_xfer_create_sgl(XHCITransfer *xfer, int in_xfer)switch (TRB_TYPE (*trb)) {case TR_DATA :if ((!(trb->control &TRB_TR_DIR )) != (!in_xfer)) { -fprintf (stderr,"xhci: data direction mismatch for TR_DATA\n" ); +DPRINTF ("xhci: data direction mismatch for TR_DATA\n" ); goto err; }/* fallthrough */
@@ -1695,7 +1695,7 @@ static int xhci_xfer_create_sgl(XHCITransfer *xfer, int in_xfer) chunk = trb->status &0x1ffff ;if (trb->control &TRB_TR_IDT ) {if (chunk >8 || in_xfer) { -fprintf (stderr,"xhci: invalid immediate data TRB\n" ); +DPRINTF ("xhci: invalid immediate data TRB\n" ); goto err; }qemu_sglist_add (&xfer->sgl, trb->addr, chunk);
@@ -1824,7 +1824,7 @@ static int xhci_setup_packet(XHCITransfer *xfer) }else { ep =xhci_epid_to_usbep (xhci, xfer->slotid, xfer->epid);if (!ep) { -fprintf (stderr,"xhci: slot %d has no device\n" , +DPRINTF ("xhci: slot %d has no device\n" , xfer->slotid);return -1 ; }
@@ -1887,7 +1887,7 @@ static int xhci_complete_packet(XHCITransfer *xfer)xhci_stall_ep (xfer);break ;default : -fprintf (stderr,"%s: FIXME: status = %d\n" , __func__, +DPRINTF ("%s: FIXME: status = %d\n" , __func__, xfer->packet.status);FIXME ("unhandled USB_RET_*" ); }
@@ -1911,21 +1911,21 @@ static int xhci_fire_ctl_transfer(XHCIState *xhci, XHCITransfer *xfer)/* do some sanity checks */ if (TRB_TYPE (*trb_setup) !=TR_SETUP ) { -fprintf (stderr,"xhci: ep0 first TD not SETUP: %d\n" , +DPRINTF ("xhci: ep0 first TD not SETUP: %d\n" ,TRB_TYPE (*trb_setup));return -1 ; }if (TRB_TYPE (*trb_status) !=TR_STATUS ) { -fprintf (stderr,"xhci: ep0 last TD not STATUS: %d\n" , +DPRINTF ("xhci: ep0 last TD not STATUS: %d\n" ,TRB_TYPE (*trb_status));return -1 ; }if (!(trb_setup->control &TRB_TR_IDT )) { -fprintf (stderr,"xhci: Setup TRB doesn't have IDT set\n" ); +DPRINTF ("xhci: Setup TRB doesn't have IDT set\n" );return -1 ; }if ((trb_setup->status &0x1ffff ) !=8 ) { -fprintf (stderr,"xhci: Setup TRB has bad length (%d)\n" , +DPRINTF ("xhci: Setup TRB has bad length (%d)\n" , (trb_setup->status &0x1ffff ));return -1 ; }
@@ -2076,12 +2076,12 @@ static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid,assert (epid >=1 && epid <=31 );if (!xhci->slots[slotid-1 ].enabled) { -fprintf (stderr,"xhci: xhci_kick_ep for disabled slot %d\n" , slotid); +DPRINTF ("xhci: xhci_kick_ep for disabled slot %d\n" , slotid);return ; } epctx = xhci->slots[slotid-1 ].eps[epid-1 ];if (!epctx) { -fprintf (stderr,"xhci: xhci_kick_ep for disabled endpoint %d,%d\n" , +DPRINTF ("xhci: xhci_kick_ep for disabled endpoint %d,%d\n" , epid, slotid);return ; }
@@ -2186,14 +2186,14 @@ static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid, epctx->next_xfer = (epctx->next_xfer +1 ) %TD_QUEUE ; ep = xfer->packet.ep; }else { -fprintf (stderr,"xhci: error firing CTL transfer\n" ); +DPRINTF ("xhci: error firing CTL transfer\n" ); } }else {if (xhci_fire_transfer (xhci, xfer, epctx) >=0 ) { epctx->next_xfer = (epctx->next_xfer +1 ) %TD_QUEUE ; }else {if (!xfer->timed_xfer) { -fprintf (stderr,"xhci: error firing data transfer\n" ); +DPRINTF ("xhci: error firing data transfer\n" ); } } }
@@ -2296,7 +2296,7 @@ static TRBCCode xhci_address_slot(XHCIState *xhci, unsigned int slotid,xhci_dma_read_u32s (xhci, ictx, ictl_ctx,sizeof (ictl_ctx));if (ictl_ctx[0 ] !=0x0 || ictl_ctx[1 ] !=0x3 ) { -fprintf (stderr,"xhci: invalid input context control %08x %08x\n" , +DPRINTF ("xhci: invalid input context control %08x %08x\n" , ictl_ctx[0 ], ictl_ctx[1 ]);return CC_TRB_ERROR ; }
@@ -2312,14 +2312,14 @@ static TRBCCode xhci_address_slot(XHCIState *xhci, unsigned int slotid, uport =xhci_lookup_uport (xhci, slot_ctx);if (uport ==NULL ) { -fprintf (stderr,"xhci: port not found\n" ); +DPRINTF ("xhci: port not found\n" );return CC_TRB_ERROR ; }trace_usb_xhci_slot_address (slotid, uport->path); dev = uport->dev;if (!dev || !dev->attached) { -fprintf (stderr,"xhci: port %s not connected\n" , uport->path); +DPRINTF ("xhci: port %s not connected\n" , uport->path);return CC_USB_TRANSACTION_ERROR ; }
@@ -2328,7 +2328,7 @@ static TRBCCode xhci_address_slot(XHCIState *xhci, unsigned int slotid,continue ; }if (xhci->slots[i].uport == uport) { -fprintf (stderr,"xhci: port %s already assigned to slot %d\n" , +DPRINTF ("xhci: port %s already assigned to slot %d\n" , uport->path, i+1 );return CC_TRB_ERROR ; }
@@ -2412,7 +2412,7 @@ static TRBCCode xhci_configure_slot(XHCIState *xhci, unsigned int slotid,xhci_dma_read_u32s (xhci, ictx, ictl_ctx,sizeof (ictl_ctx));if ((ictl_ctx[0 ] &0x3 ) !=0x0 || (ictl_ctx[1 ] &0x3 ) !=0x1 ) { -fprintf (stderr,"xhci: invalid input context control %08x %08x\n" , +DPRINTF ("xhci: invalid input context control %08x %08x\n" , ictl_ctx[0 ], ictl_ctx[1 ]);return CC_TRB_ERROR ; }
@@ -2421,7 +2421,7 @@ static TRBCCode xhci_configure_slot(XHCIState *xhci, unsigned int slotid,xhci_dma_read_u32s (xhci, octx, slot_ctx,sizeof (slot_ctx));if (SLOT_STATE (slot_ctx[3 ]) <SLOT_ADDRESSED ) { -fprintf (stderr,"xhci: invalid slot state %08x\n" , slot_ctx[3 ]); +DPRINTF ("xhci: invalid slot state %08x\n" , slot_ctx[3 ]);return CC_CONTEXT_STATE_ERROR ; }
@@ -2494,7 +2494,7 @@ static TRBCCode xhci_evaluate_slot(XHCIState *xhci, unsigned int slotid,xhci_dma_read_u32s (xhci, ictx, ictl_ctx,sizeof (ictl_ctx));if (ictl_ctx[0 ] !=0x0 || ictl_ctx[1 ] & ~0x3 ) { -fprintf (stderr,"xhci: invalid input context control %08x %08x\n" , +DPRINTF ("xhci: invalid input context control %08x %08x\n" , ictl_ctx[0 ], ictl_ctx[1 ]);return CC_TRB_ERROR ; }
@@ -2573,11 +2573,11 @@ static unsigned int xhci_get_slot(XHCIState *xhci, XHCIEvent *event, XHCITRB *trunsigned int slotid; slotid = (trb->control >>TRB_CR_SLOTID_SHIFT ) &TRB_CR_SLOTID_MASK ;if (slotid <1 || slotid > xhci->numslots) { -fprintf (stderr,"xhci: bad slot id %d\n" , slotid); +DPRINTF ("xhci: bad slot id %d\n" , slotid); event->ccode =CC_TRB_ERROR ;return 0 ; }else if (!xhci->slots[slotid-1 ].enabled) { -fprintf (stderr,"xhci: slot id %d not enabled\n" , slotid); +DPRINTF ("xhci: slot id %d not enabled\n" , slotid); event->ccode =CC_SLOT_NOT_ENABLED_ERROR ;return 0 ; }
@@ -2693,7 +2693,7 @@ static void xhci_process_commands(XHCIState *xhci) } }if (i >= xhci->numslots) { -fprintf (stderr,"xhci: no device slots available\n" ); +DPRINTF ("xhci: no device slots available\n" ); event.ccode =CC_NO_SLOTS_ERROR ; }else { slotid = i+1 ;
@@ -2885,7 +2885,7 @@ static void xhci_reset(DeviceState *dev)trace_usb_xhci_reset ();if (!(xhci->usbsts &USBSTS_HCH )) { -fprintf (stderr,"xhci: reset while running!\n" ); +DPRINTF ("xhci: reset while running!\n" ); } xhci->usbcmd =0 ;
@@ -3063,7 +3063,7 @@ static void xhci_port_write(void *ptr, hwaddr reg,/* windows does this for some reason, don't spam stderr */ break ;default : -fprintf (stderr,"%s: ignore pls write (old %d, new %d)\n" , +DPRINTF ("%s: ignore pls write (old %d, new %d)\n" , __func__, old_pls, new_pls);break ; }
@@ -3314,7 +3314,7 @@ static void xhci_doorbell_write(void *ptr, hwaddr reg,trace_usb_xhci_doorbell_write (reg, val);if (!xhci_running (xhci)) { -fprintf (stderr,"xhci: wrote doorbell while xHC stopped or paused\n" ); +DPRINTF ("xhci: wrote doorbell while xHC stopped or paused\n" );return ; }
@@ -3324,16 +3324,16 @@ static void xhci_doorbell_write(void *ptr, hwaddr reg,if (val ==0 ) {xhci_process_commands (xhci); }else { -fprintf (stderr,"xhci: bad doorbell 0 write: 0x%x\n" , +DPRINTF ("xhci: bad doorbell 0 write: 0x%x\n" , (uint32_t )val); } }else { epid = val &0xff ; streamid = (val >>16 ) &0xffff ;if (reg > xhci->numslots) { -fprintf (stderr,"xhci: bad doorbell %d\n" , (int )reg); +DPRINTF ("xhci: bad doorbell %d\n" , (int )reg); }else if (epid >31 ) { -fprintf (stderr,"xhci: bad doorbell %d write: 0x%x\n" , +DPRINTF ("xhci: bad doorbell %d write: 0x%x\n" , (int )reg, (uint32_t )val); }else {xhci_kick_ep (xhci, reg, epid, streamid);
Signature · 1 line
1.8.3.1
Peter Maydell
AppliedQuoted 9 lines · Gerd Hoffmann
Hi,
Nothing major. Cleanups, bugfixes, xhci emulation improvements.
please pull,
GerdThe following changes since commit
46eef33b89e936ca793e13c4aeea1414e97e8dbb:
Quoted 7 lines
Fix QEMU build on OpenBSD on x86 archs (2014-02-17 11:44:00 +0000)
are available in the git repository at:
git://git.kraxel.org/qemutags/pull-usb-3for you to fetch changes up to
d6bb65fcd24c8cb8c37ffe324c360f3b0c94b902:
Applied, thanks.
-- PMM