diff options
| author | grehan <grehan@FreeBSD.org> | 2016-09-12 00:16:26 +0000 |
|---|---|---|
| committer | grehan <grehan@FreeBSD.org> | 2016-09-12 00:16:26 +0000 |
| commit | 2d6263ede0e9fb0f27302196970483a2de6a58e1 (patch) | |
| tree | 1cf845d1ef96f0b7080ad2ef23484d1a669ce7fc /usr.sbin | |
| parent | 1c4c8f3049fcb318d2a5a3f0e5a04ecf55deadb0 (diff) | |
| download | FreeBSD-src-2d6263ede0e9fb0f27302196970483a2de6a58e1.zip FreeBSD-src-2d6263ede0e9fb0f27302196970483a2de6a58e1.tar.gz | |
MFC r302972,r303349
r302972
Disallow interrupt requests on disabled endpoints.
r303349
Catch another case where an XHCI interrupt was being
injected without state being set up.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/bhyve/pci_xhci.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c index 805c4cc..d28a3e6 100644 --- a/usr.sbin/bhyve/pci_xhci.c +++ b/usr.sbin/bhyve/pci_xhci.c @@ -2537,9 +2537,11 @@ static int pci_xhci_dev_intr(struct usb_hci *hci, int epctx) { struct pci_xhci_dev_emu *dev; + struct xhci_dev_ctx *dev_ctx; struct xhci_trb evtrb; struct pci_xhci_softc *sc; struct pci_xhci_portregs *p; + struct xhci_endp_ctx *ep_ctx; int error; int dir_in; int epid; @@ -2557,7 +2559,8 @@ pci_xhci_dev_intr(struct usb_hci *hci, int epctx) /* check if device is ready; OS has to initialise it */ if (sc->rtsregs.erstba_p == NULL || - (sc->opregs.usbcmd & XHCI_CMD_RS) == 0) + (sc->opregs.usbcmd & XHCI_CMD_RS) == 0 || + dev->dev_ctx == NULL) return (0); p = XHCI_PORTREG_PTR(sc, hci->hci_port); @@ -2578,6 +2581,14 @@ pci_xhci_dev_intr(struct usb_hci *hci, int epctx) goto done; } + dev_ctx = dev->dev_ctx; + ep_ctx = &dev_ctx->ctx_ep[epid]; + if ((ep_ctx->dwEpCtx0 & 0x7) == XHCI_ST_EPCTX_DISABLED) { + DPRINTF(("xhci device interrupt on disabled endpoint %d\r\n", + epid)); + return (0); + } + DPRINTF(("xhci device interrupt on endpoint %d\r\n", epid)); pci_xhci_device_doorbell(sc, hci->hci_port, epid, 0); |
