github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-19 09:53:01 +00:00
Code Issues Projects Releases Wiki Activity

DM USB: modify disconnecting logic to support Windows 10

Browse Source 
The Windows 10 feeds back quicker than Linux OS when error occured
due to device disconnecting, it will quickly reset the xHCI controller
before the DM starts to emulate disconnect event and it may cause some
unexpected errors such as crash.

This patch will do one more check when error happens, if the error
is induced by device disconnecting, the DM will not report error and
just wait until the disconnect event is reported to the guest. This
change could produce the correct hehavior as we expected.

Tracked-On: #3628
Signed-off-by: Xiaoguang Wu <xiaoguang.wu@intel.com>
Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Xiaoguang Wu 2019-09-11 00:07:37 +08:00 committed by wenlingz
parent 06781b37e9
commit e9211514e7
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devicemodel/hw/platform/usb_pmapper.c
View File

@ -214,6 +214,14 @@ usb_dev_comp_cb(struct libusb_transfer *trn)
xfer->status = USB_ERR_SHORT_XFER;
goto out;
case LIBUSB_TRANSFER_ERROR:
/*
* If this error happened due to device disconnecting, there is
* nothing should do and just wait usb_dev_native_sys_disconn_cb
* to do the 'unplugging process'.
*/
if (usb_native_is_device_existed(&info->path) == 0)
goto cancel_out;
is_stalled = 1;
xfer->status = USB_ERR_STALLED;
goto stall_out;

14
devicemodel/hw/usb_core.c
View File

@ -181,6 +181,20 @@ usb_native_is_port_existed(uint8_t bus_num, uint8_t port_num)
return 1;
}
int
usb_native_is_device_existed(struct usb_devpath *path)
{
char _path[128];
int ret = 0;
if (path) {
snprintf(_path, sizeof(_path), "%s/%s", NATIVE_USBSYS_DEVDIR,
usb_dev_path(path));
ret = (access(_path, F_OK) == 0);
}
return ret;
}
void usb_parse_log_level(char level)
{
switch (level) {

1
devicemodel/include/usb_core.h
View File

@ -247,6 +247,7 @@ void usb_parse_log_level(char level);
struct usb_devemu *usb_emu_finddev(char *name);
int usb_native_is_bus_existed(uint8_t bus_num);
int usb_native_is_port_existed(uint8_t bus_num, uint8_t port_num);
int usb_native_is_device_existed(struct usb_devpath *path);
struct usb_block *usb_block_append(struct usb_xfer *xfer, void *buf, int blen,
void *hcb, int hcb_len);
int usb_get_hub_port_num(struct usb_devpath *path);