diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2015-12-20 15:50:10 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2015-12-20 15:50:10 -0500 |
| commit | 636cbb435a6fb9f08689e32fc87d699fb5b1d8f3 (patch) | |
| tree | f0aa66bd2ccf04cd6c95b9bdf944959f3fb87cb4 /src/hw/usb-xhci.c | |
| parent | 49fb0349b886c0d94ca9978356fc74f67682588f (diff) | |
| download | seabios-636cbb435a6fb9f08689e32fc87d699fb5b1d8f3.tar.gz | |
xhci: Disable slot on failed set_address command
If the set_address command fails, attempt to free up the slot resource
associated with the attempt.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/hw/usb-xhci.c')
| -rw-r--r-- | src/hw/usb-xhci.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/hw/usb-xhci.c b/src/hw/usb-xhci.c index 5f44239a..3359cffd 100644 --- a/src/hw/usb-xhci.c +++ b/src/hw/usb-xhci.c @@ -785,7 +785,6 @@ static int xhci_cmd_enable_slot(struct usb_xhci_s *xhci) return (xhci->cmds->evt.control >> 24) & 0xff; } -#if 0 static int xhci_cmd_disable_slot(struct usb_xhci_s *xhci, u32 slotid) { struct xhci_trb cmd = { @@ -797,7 +796,6 @@ static int xhci_cmd_disable_slot(struct usb_xhci_s *xhci, u32 slotid) dprintf(3, "%s: slotid %d\n", __func__, slotid); return xhci_cmd_submit(xhci, &cmd); } -#endif static int xhci_cmd_address_device(struct usb_xhci_s *xhci, u32 slotid , struct xhci_inctx *inctx) @@ -992,7 +990,6 @@ xhci_alloc_pipe(struct usbdevice_s *usbdev } dprintf(3, "%s: enable slot: got slotid %d\n", __func__, slotid); memset(dev, 0, size); - pipe->slotid = usbdev->slotid = slotid; xhci->devs[slotid].ptr_low = (u32)dev; xhci->devs[slotid].ptr_high = 0; @@ -1000,8 +997,16 @@ xhci_alloc_pipe(struct usbdevice_s *usbdev int cc = xhci_cmd_address_device(xhci, slotid, in); if (cc != CC_SUCCESS) { dprintf(1, "%s: address device: failed (cc %d)\n", __func__, cc); + cc = xhci_cmd_disable_slot(xhci, slotid); + if (cc != CC_SUCCESS) { + dprintf(1, "%s: disable failed (cc %d)\n", __func__, cc); + goto fail; + } + xhci->devs[slotid].ptr_low = 0; + free(dev); goto fail; } + pipe->slotid = usbdev->slotid = slotid; } else { pipe->slotid = usbdev->slotid; // Send configure command. |