usb-uhci: queuing fix
When we queue up usb packets we may happen to find a already queued packet, which also might be finished at that point already. We don't want continue processing the packet at this point though, so lets just signal back we've found a in-flight packet when in queuing mode. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
52b0fecdba
commit
ee008ba626
|
@ -795,7 +795,8 @@ out:
|
||||||
return TD_RESULT_NEXT_QH;
|
return TD_RESULT_NEXT_QH;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int uhci_handle_td(UHCIState *s, uint32_t addr, UHCI_TD *td, uint32_t *int_mask)
|
static int uhci_handle_td(UHCIState *s, uint32_t addr, UHCI_TD *td,
|
||||||
|
uint32_t *int_mask, bool queuing)
|
||||||
{
|
{
|
||||||
UHCIAsync *async;
|
UHCIAsync *async;
|
||||||
int len = 0, max_len;
|
int len = 0, max_len;
|
||||||
|
@ -814,6 +815,12 @@ static int uhci_handle_td(UHCIState *s, uint32_t addr, UHCI_TD *td, uint32_t *in
|
||||||
|
|
||||||
if (!async->done)
|
if (!async->done)
|
||||||
return TD_RESULT_ASYNC_CONT;
|
return TD_RESULT_ASYNC_CONT;
|
||||||
|
if (queuing) {
|
||||||
|
/* we are busy filling the queue, we are not prepared
|
||||||
|
to consume completed packages then, just leave them
|
||||||
|
in async state */
|
||||||
|
return TD_RESULT_ASYNC_CONT;
|
||||||
|
}
|
||||||
|
|
||||||
uhci_async_unlink(async);
|
uhci_async_unlink(async);
|
||||||
goto done;
|
goto done;
|
||||||
|
@ -964,7 +971,7 @@ static void uhci_fill_queue(UHCIState *s, UHCI_TD *td)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
trace_usb_uhci_td_queue(plink & ~0xf, ptd.ctrl, ptd.token);
|
trace_usb_uhci_td_queue(plink & ~0xf, ptd.ctrl, ptd.token);
|
||||||
ret = uhci_handle_td(s, plink, &ptd, &int_mask);
|
ret = uhci_handle_td(s, plink, &ptd, &int_mask, true);
|
||||||
if (ret == TD_RESULT_ASYNC_CONT) {
|
if (ret == TD_RESULT_ASYNC_CONT) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1048,7 +1055,7 @@ static void uhci_process_frame(UHCIState *s)
|
||||||
trace_usb_uhci_td_load(curr_qh & ~0xf, link & ~0xf, td.ctrl, td.token);
|
trace_usb_uhci_td_load(curr_qh & ~0xf, link & ~0xf, td.ctrl, td.token);
|
||||||
|
|
||||||
old_td_ctrl = td.ctrl;
|
old_td_ctrl = td.ctrl;
|
||||||
ret = uhci_handle_td(s, link, &td, &int_mask);
|
ret = uhci_handle_td(s, link, &td, &int_mask, false);
|
||||||
if (old_td_ctrl != td.ctrl) {
|
if (old_td_ctrl != td.ctrl) {
|
||||||
/* update the status bits of the TD */
|
/* update the status bits of the TD */
|
||||||
val = cpu_to_le32(td.ctrl);
|
val = cpu_to_le32(td.ctrl);
|
||||||
|
|
Loading…
Reference in a new issue