ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-03-12 07:24:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lx_emul usb: make reset ep effective

Browse Source 
* Within flush_transfer of the USB session a given entrypoint gets
  resetted, to be effective al related URBs need to be discarded first
* Discarding URBs shall be done in reverse order, like libusb is doing it,
  where it warns about potential races otherwise

Ref genodelabs/genode#4969
This commit is contained in:
Stefan Kalkowski 2023-07-19 16:43:41 +02:00 committed by Christian Helmuth
parent 68fd016746
commit 8f4903ca86
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
repos/dde_linux/src/lib/lx_emul/usb.c
View File

@ -287,7 +287,8 @@ static void release_device(struct usb_per_dev_data * data, int reset)
struct usb_urb_in_flight *iter, *next; struct usb_urb_in_flight *iter, *next;
int ret = -ENODEV; int ret = -ENODEV;
list_for_each_entry_safe(iter, next, &data->urblist, le) { /* discard URBs in reverse order like libusb is doing it */
list_for_each_entry_safe_reverse(iter, next, &data->urblist, le) {
usbdev_file_operations->unlocked_ioctl(&data->file, usbdev_file_operations->unlocked_ioctl(&data->file,
USBDEVFS_DISCARDURB, USBDEVFS_DISCARDURB,
(unsigned long)&iter->urb); (unsigned long)&iter->urb);
@ -515,9 +516,21 @@ handle_flush_request(unsigned char ep,
{ {
struct usb_device * udev = (struct usb_device *) data; struct usb_device * udev = (struct usb_device *) data;
struct file * file = open_usb_dev(udev); struct file * file = open_usb_dev(udev);
struct usb_per_dev_data * d = dev_get_drvdata(&udev->dev);
struct usb_urb_in_flight *iter, *next;
unsigned int e = ep; unsigned int e = ep;
int ret = int ret = -ENODEV;
usbdev_file_operations->unlocked_ioctl(file,
/* discard URBs of the related EP in reverse order, like libusb is doing */
list_for_each_entry_safe_reverse(iter, next, &d->urblist, le) {
if (iter->urb.endpoint == ep) {
usbdev_file_operations->unlocked_ioctl(file,
USBDEVFS_DISCARDURB,
(unsigned long)&iter->urb);
}
}
ret = usbdev_file_operations->unlocked_ioctl(file,
USBDEVFS_RESETEP, USBDEVFS_RESETEP,
(unsigned long)&e); (unsigned long)&e);
genode_usb_ack_request(session, request, handle_return_code, &ret); genode_usb_ack_request(session, request, handle_return_code, &ret);