Page MenuHomeFreeBSD
Files F154487640

D51735.id161059.diff
No OneTemporary
Actions

D51735.id161059.diff
View Options

diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c
--- a/usr.sbin/bhyve/pci_xhci.c
+++ b/usr.sbin/bhyve/pci_xhci.c
@@ -691,6 +691,18 @@
}
}
+static void
+pci_xhci_clear_ep_xfer(struct pci_xhci_dev_emu *dev, struct usb_data_xfer *xfer)
+{
+ USB_DATA_XFER_LOCK(xfer);
+ if (dev->dev_ue->ue_cancel)
+ (void)dev->dev_ue->ue_cancel(xfer);
+ if (xfer->ureq)
+ free(xfer->ureq);
+ xfer->ureq = NULL;
+ USB_DATA_XFER_UNLOCK(xfer);
+}
+
static void
pci_xhci_disable_ep(struct pci_xhci_dev_emu *dev, int epid)
{
@@ -709,6 +721,7 @@
free(devep->ep_sctx_trbs);
if (devep->ep_xfer != NULL) {
+ pci_xhci_clear_ep_xfer(dev, devep->ep_xfer);
free(devep->ep_xfer);
devep->ep_xfer = NULL;
}
@@ -722,6 +735,8 @@
pci_xhci_reset_slot(struct pci_xhci_softc *sc, int slot)
{
struct pci_xhci_dev_emu *dev;
+ struct usb_data_xfer *xfer;
+ int ep;
dev = XHCI_SLOTDEV_PTR(sc, slot);
@@ -729,9 +744,15 @@
DPRINTF(("xhci reset unassigned slot (%d)?", slot));
} else {
dev->dev_slotstate = XHCI_ST_DISABLED;
+ for (ep = 0; ep < XHCI_MAX_ENDPOINTS; ++ep) {
+ xfer = dev->eps[ep].ep_xfer;
+ if (xfer) {
+ pci_xhci_clear_ep_xfer(dev, xfer);
+ free(xfer);
+ dev->eps[ep].ep_xfer = NULL;
+ }
+ }
}
-
- /* TODO: reset ring buffer pointers */
}
static int
@@ -1193,11 +1214,13 @@
epid, ep_ctx->dwEpCtx0, ep_ctx->dwEpCtx1, ep_ctx->qwEpCtx2,
ep_ctx->dwEpCtx4));
- if (type == XHCI_TRB_TYPE_RESET_EP &&
- (dev->dev_ue->ue_reset == NULL ||
- dev->dev_ue->ue_reset(dev->dev_sc) < 0)) {
- cmderr = XHCI_TRB_ERROR_ENDP_NOT_ON;
- goto done;
+ if (type == XHCI_TRB_TYPE_STOP_EP && devep->ep_xfer != NULL) {
+ USB_DATA_XFER_LOCK(devep->ep_xfer);
+ if (dev->dev_ue->ue_cancel == NULL ||
+ dev->dev_ue->ue_cancel(devep->ep_xfer) !=
+ USB_ERR_NORMAL_COMPLETION)
+ cmderr = XHCI_TRB_ERROR_ENDP_NOT_ON;
+ USB_DATA_XFER_UNLOCK(devep->ep_xfer);
}
done:
diff --git a/usr.sbin/bhyve/usb_emul.h b/usr.sbin/bhyve/usb_emul.h
--- a/usr.sbin/bhyve/usb_emul.h
+++ b/usr.sbin/bhyve/usb_emul.h
@@ -63,6 +63,7 @@
int (*ue_remove)(void *sc);
int (*ue_stop)(void *sc);
int (*ue_snapshot)(void *scarg, struct vm_snapshot_meta *meta);
+ int (*ue_cancel)(struct usb_data_xfer *xfer);
};
#define USB_EMUL_SET(x) DATA_SET(usb_emu_set, x)

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 29, 6:05 PM (7 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32343122
Default Alt Text
D51735.id161059.diff (2 KB)

Event Timeline