d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bhyve: Simplify control flow in the xhci device model

Browse Source 
We only need to call pci_xhci_xfer_complete() when handling a transfer
to the control endpoint, so move that code into the epid == 1 block and
eliminate a goto.  Also remove an unneeded reinitialization of
setup_trb.

No functional change intended.

MFC after:	1 week
Reviewed by:	corvink, jhb
Differential Revision:	https://reviews.freebsd.org/D37287
This commit is contained in:
Mark Johnston 2022-11-14 15:08:45 -05:00
parent db494ceb65
commit c4c368fb3e
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
usr.sbin/bhyve/pci_xhci.c
View File

@ -1725,7 +1725,7 @@ pci_xhci_handle_transfer(struct pci_xhci_softc *sc,
DPRINTF(("pci_xhci handle_transfer slot %u", slot));
retry:
err = 0;
err = XHCI_TRB_ERROR_INVALID;
do_retry = 0;
do_intr = 0;
setup_trb = NULL;
@ -1849,24 +1849,26 @@ pci_xhci_handle_transfer(struct pci_xhci_softc *sc,
goto errout;
if (epid == 1) {
err = USB_ERR_NOT_STARTED;
int usberr;
if (dev->dev_ue->ue_request != NULL)
err = dev->dev_ue->ue_request(dev->dev_sc, xfer);
setup_trb = NULL;
usberr = dev->dev_ue->ue_request(dev->dev_sc, xfer);
else
usberr = USB_ERR_NOT_STARTED;
err = USB_TO_XHCI_ERR(usberr);
if (err == XHCI_TRB_ERROR_SUCCESS ||
err == XHCI_TRB_ERROR_STALL ||
err == XHCI_TRB_ERROR_SHORT_PKT) {
err = pci_xhci_xfer_complete(sc, xfer, slot, epid,
&do_intr);
if (err != XHCI_TRB_ERROR_SUCCESS)
do_retry = 0;
}
} else {
/* handle data transfer */
pci_xhci_try_usb_xfer(sc, dev, devep, ep_ctx, slot, epid);
err = XHCI_TRB_ERROR_SUCCESS;
goto errout;
}
err = USB_TO_XHCI_ERR(err);
if ((err == XHCI_TRB_ERROR_SUCCESS) ||
(err == XHCI_TRB_ERROR_STALL) ||
(err == XHCI_TRB_ERROR_SHORT_PKT)) {
err = pci_xhci_xfer_complete(sc, xfer, slot, epid, &do_intr);
if (err != XHCI_TRB_ERROR_SUCCESS)
do_retry = 0;
}
errout: