denshooter/genode
1
0
Fork 0
mirror of https://github.com/mmueller41/genode.git synced 2026-01-21 12:32:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

lx_emul: increase usb driver dynamic robustness

Browse Source 
* Prevent page-faults when the active interface of a device got unset
  during elimination of the device
* Resets devices, where a corresponding session got closed to
  be re-useable when a new session gets opened

Ref #4512
This commit is contained in:
Stefan Kalkowski
2022-05-20 11:48:09 +02:00
committed by Christian Helmuth
parent ba6a3526a9
commit 115ac58fd0
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -265,6 +265,10 @@ static int usb_rpc_call(void * data)
else else
release_iface(iface); release_iface(iface);
} }
if (usb_rpc_args.call == RELEASE_ALL)
usb_reset_device(udev);
usb_rpc_args.ret = ret; usb_rpc_args.ret = ret;
} }
return 0; return 0;
@@ -456,6 +460,9 @@ static struct usb_interface * usb_get_iface_from_urb(struct urb * urb)
unsigned i, j; unsigned i, j;
struct usb_host_endpoint * ep = usb_pipe_endpoint(urb->dev, urb->pipe); struct usb_host_endpoint * ep = usb_pipe_endpoint(urb->dev, urb->pipe);
if (!ep || !urb->dev || !urb->dev->actconfig)
return NULL;
for (i = 0; i < urb->dev->actconfig->desc.bNumInterfaces; i++) { for (i = 0; i < urb->dev->actconfig->desc.bNumInterfaces; i++) {
struct usb_interface * iface = urb->dev->actconfig->interface[i]; struct usb_interface * iface = urb->dev->actconfig->interface[i];
if (!iface || !iface->cur_altsetting) if (!iface || !iface->cur_altsetting)
@@ -473,7 +480,7 @@ static struct usb_interface * usb_get_iface_from_urb(struct urb * urb)
static void async_complete(struct urb *urb) static void async_complete(struct urb *urb)
{ {
struct usb_interface * iface; struct usb_interface * iface;
struct usb_iface_urbs * urbs; struct usb_iface_urbs * urbs = NULL;
unsigned long handle = (unsigned long)urb->context; unsigned long handle = (unsigned long)urb->context;
genode_usb_session_handle_t session = genode_usb_session_handle_t session =
@@ -485,8 +492,9 @@ static void async_complete(struct urb *urb)
handle_transfer_response, (void*)urb); handle_transfer_response, (void*)urb);
iface = usb_get_iface_from_urb(urb); iface = usb_get_iface_from_urb(urb);
urbs = usb_get_intfdata(iface); if (iface)
if (!urbs->in_delete) { urbs = usb_get_intfdata(iface);
if (!urbs || !urbs->in_delete) {
usb_free_urb(urb); usb_free_urb(urb);
lx_user_handle_io(); lx_user_handle_io();
} }
@@ -621,6 +629,11 @@ handle_transfer_request(struct genode_usb_request_transfer * req,
if (!err) { if (!err) {
struct usb_iface_urbs * urbs; struct usb_iface_urbs * urbs;
struct usb_interface * iface = usb_get_iface_from_urb(urb); struct usb_interface * iface = usb_get_iface_from_urb(urb);
if (!iface) {
usb_free_urb(urb);
return NO_DEVICE_ERROR;
}
if (!usb_interface_claimed(iface)) if (!usb_interface_claimed(iface))
claim_iface(iface); claim_iface(iface);
urbs = usb_get_intfdata(iface); urbs = usb_get_intfdata(iface);