github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-19 12:12:16 +00:00
Code Issues Projects Releases Wiki Activity

DM: xHCI: Release all device resource when received HCRST.

Browse Source 
There has one bug that the pci_xhci_dev_emu objects recorded in
xdev->devices haven't destroy when OVMF transfer to guest OS.
This will cause the the fds of usbfs can't be freed in libusb.
The OVMF xHCI driver needs to disable all enabled slots during
graceful existing flow, but it doesn't.
The USBCMD.HCRST bit is used for xHC reset that will be triggered
in xHCI driver initialization. We can use this chance to clear
all pci_xhci_dev_emu objects

Tracked-On: #4897
Signed-off-by: Long Liu <long.liu@intel.com>
Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Long Liu 2020-07-21 05:35:09 +00:00 committed by wenlingz
parent 28c9e35771
commit 312ea0b374
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devicemodel/hw/pci/xhci.c
View File

@ -1192,9 +1192,26 @@ pci_xhci_reset(struct pci_xhci_vdev *xdev)
xdev->rtsregs.er_enq_idx = 0; xdev->rtsregs.er_enq_idx = 0;
xdev->rtsregs.er_enq_seg = 0; xdev->rtsregs.er_enq_seg = 0;
xdev->rtsregs.event_pcs = 1; xdev->rtsregs.event_pcs = 1;
struct pci_xhci_dev_emu *dev;
for (i = 1; i <= XHCI_MAX_DEVS; i++)
{
dev = xdev->devices[i];
if (dev) {
xdev->devices[i] = NULL;
pci_xhci_dev_destroy(dev);
/* FIXME: The ndevices hasn't
* aligned between ++ and --
* */
xdev->ndevices--;
}
}
for (i = 1; i <= XHCI_MAX_SLOTS; i++) for (i = 1; i <= XHCI_MAX_SLOTS; i++)
pci_xhci_reset_slot(xdev, i); {
xdev->slots[i] = NULL;
xdev->slot_allocated[i] = false;
}
} }
static uint32_t static uint32_t