ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/usb-ohci: Honour endpoint maximum packet size 

Honour the maximum packet size for endpoints; this applies when
sending non-isochronous data and means we transfer only as
much as the endpoint allows, leaving the transfer descriptor
on the list for another go next time around. This allows
usb-net to work when connected to an OHCI controller model.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Peter Maydell 2011-09-14 18:48:59 +01:00 committed by Gerd Hoffmann
parent 8d11b78c9a
commit 905fb0342c
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hw/usb-ohci.c
View File

@ -872,7 +872,7 @@ static int ohci_service_iso_td(OHCIState *ohci, struct ohci_ed *ed,
static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed) static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed)
{ {
int dir; int dir;
size_t len = 0; size_t len = 0, pktlen = 0;
#ifdef DEBUG_PACKET #ifdef DEBUG_PACKET
const char *str = NULL; const char *str = NULL;
#endif #endif
@ -940,20 +940,30 @@ static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed)
len = (td.be - td.cbp) + 1; len = (td.be - td.cbp) + 1;
} }
if (len && dir != OHCI_TD_DIR_IN && !completion) { pktlen = len;
ohci_copy_td(ohci, &td, ohci->usb_buf, len, 0); if (len && dir != OHCI_TD_DIR_IN) {
/* The endpoint may not allow us to transfer it all now */
pktlen = (ed->flags & OHCI_ED_MPS_MASK) >> OHCI_ED_MPS_SHIFT;
if (pktlen > len) {
pktlen = len;
}
if (!completion) {
ohci_copy_td(ohci, &td, ohci->usb_buf, pktlen, 0);
}
} }
} }
flag_r = (td.flags & OHCI_TD_R) != 0; flag_r = (td.flags & OHCI_TD_R) != 0;
#ifdef DEBUG_PACKET #ifdef DEBUG_PACKET
DPRINTF(" TD @ 0x%.8x %" PRId64 " bytes %s r=%d cbp=0x%.8x be=0x%.8x\n", DPRINTF(" TD @ 0x%.8x %" PRId64 " of %" PRId64
addr, (int64_t)len, str, flag_r, td.cbp, td.be); " bytes %s r=%d cbp=0x%.8x be=0x%.8x\n",
addr, (int64_t)pktlen, (int64_t)len, str, flag_r, td.cbp, td.be);
if (len > 0 && dir != OHCI_TD_DIR_IN) { if (pktlen > 0 && dir != OHCI_TD_DIR_IN) {
DPRINTF(" data:"); DPRINTF(" data:");
for (i = 0; i < len; i++) for (i = 0; i < pktlen; i++) {
printf(" %.2x", ohci->usb_buf[i]); printf(" %.2x", ohci->usb_buf[i]);
}
DPRINTF("\n"); DPRINTF("\n");
} }
#endif #endif
@ -982,7 +992,7 @@ static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed)
usb_packet_setup(&ohci->usb_packet, pid, usb_packet_setup(&ohci->usb_packet, pid,
OHCI_BM(ed->flags, ED_FA), OHCI_BM(ed->flags, ED_FA),
OHCI_BM(ed->flags, ED_EN)); OHCI_BM(ed->flags, ED_EN));
usb_packet_addbuf(&ohci->usb_packet, ohci->usb_buf, len); usb_packet_addbuf(&ohci->usb_packet, ohci->usb_buf, pktlen);
ret = usb_handle_packet(dev, &ohci->usb_packet); ret = usb_handle_packet(dev, &ohci->usb_packet);
if (ret != USB_RET_NODEV) if (ret != USB_RET_NODEV)
break; break;
@ -1005,12 +1015,12 @@ static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed)
DPRINTF("\n"); DPRINTF("\n");
#endif #endif
} else { } else {
ret = len; ret = pktlen;
} }
} }
/* Writeback */ /* Writeback */
if (ret == len || (dir == OHCI_TD_DIR_IN && ret >= 0 && flag_r)) { if (ret == pktlen || (dir == OHCI_TD_DIR_IN && ret >= 0 && flag_r)) {
/* Transmission succeeded. */ /* Transmission succeeded. */
if (ret == len) { if (ret == len) {
td.cbp = 0; td.cbp = 0;
@ -1026,6 +1036,12 @@ static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed)
OHCI_SET_BM(td.flags, TD_CC, OHCI_CC_NOERROR); OHCI_SET_BM(td.flags, TD_CC, OHCI_CC_NOERROR);
OHCI_SET_BM(td.flags, TD_EC, 0); OHCI_SET_BM(td.flags, TD_EC, 0);
if ((dir != OHCI_TD_DIR_IN) && (ret != len)) {
/* Partial packet transfer: TD not ready to retire yet */
goto exit_no_retire;
}
/* Setting ED_C is part of the TD retirement process */
ed->head &= ~OHCI_ED_C; ed->head &= ~OHCI_ED_C;
if (td.flags & OHCI_TD_T0) if (td.flags & OHCI_TD_T0)
ed->head |= OHCI_ED_C; ed->head |= OHCI_ED_C;
@ -1066,6 +1082,7 @@ static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed)
i = OHCI_BM(td.flags, TD_DI); i = OHCI_BM(td.flags, TD_DI);
if (i < ohci->done_count) if (i < ohci->done_count)
ohci->done_count = i; ohci->done_count = i;
exit_no_retire:
ohci_put_td(ohci, addr, &td); ohci_put_td(ohci, addr, &td);
return OHCI_BM(td.flags, TD_CC) != OHCI_CC_NOERROR; return OHCI_BM(td.flags, TD_CC) != OHCI_CC_NOERROR;
} }