Update USB_RAW_IOCTL_EVENT_FETCH to also report suspend, resume, reset, and disconnect events. This allows the code that emulates a USB device via Raw Gadget to handle these events. For example, the device can restart enumeration when it gets reset. Also do not print a WARNING when the event queue overflows. With these new events being queued, the queue might overflow if the device emulation code stops fetching events. Also print debug messages when a non-control event is received.
Unified · Split
| @@ -65,7 +65,7 @@ static int raw_event_queue_add(struct raw_event_queue *queue, · 64 unmodified lines | ||
| 65 | 65 | struct usb_raw_event *event; |
| 66 | 66 | |
| 67 | 67 | spin_lock_irqsave(&queue->lock, flags); |
| 68 | − if (WARN_ON(queue->size >= RAW_EVENT_QUEUE_SIZE)) { | |
| 68 | + if (queue->size >= RAW_EVENT_QUEUE_SIZE) { | |
| 69 | 69 | spin_unlock_irqrestore(&queue->lock, flags); |
| 70 | 70 | return -ENOMEM; |
| 71 | 71 | } |
| @@ -311,9 +311,10 @@ static int gadget_bind(struct usb_gadget *gadget, · 239 unmodified lines | ||
| 311 | 311 | dev->eps_num = i; |
| 312 | 312 | spin_unlock_irqrestore(&dev->lock, flags); |
| 313 | 313 | |
| 314 | + dev_dbg(&gadget->dev, "gadget connected\n"); | |
| 314 | 315 | ret = raw_queue_event(dev, USB_RAW_EVENT_CONNECT, 0, NULL); |
| 315 | 316 | if (ret < 0) { |
| 316 | − dev_err(&gadget->dev, "failed to queue event\n"); | |
| 317 | + dev_err(&gadget->dev, "failed to queue connect event\n"); | |
| 317 | 318 | set_gadget_data(gadget, NULL); |
| 318 | 319 | return ret; |
| 319 | 320 | } |
| @@ -358,7 +359,7 @@ static int gadget_setup(struct usb_gadget *gadget, · 38 unmodified lines | ||
| 358 | 359 | |
| 359 | 360 | ret = raw_queue_event(dev, USB_RAW_EVENT_CONTROL, sizeof(*ctrl), ctrl); |
| 360 | 361 | if (ret < 0) |
| 361 | − dev_err(&gadget->dev, "failed to queue event\n"); | |
| 362 | + dev_err(&gadget->dev, "failed to queue control event\n"); | |
| 362 | 363 | goto out; |
| 363 | 364 | |
| 364 | 365 | out_unlock: |
| @@ -377,11 +378,46 @@ out: · 12 unmodified lines | ||
| 377 | 378 | return ret; |
| 378 | 379 | } |
| 379 | 380 | |
| 380 | −/* These are currently unused but present in case UDC driver requires them. */ | |
| 381 | −static void gadget_disconnect(struct usb_gadget *gadget) { } | |
| 382 | −static void gadget_suspend(struct usb_gadget *gadget) { } | |
| 383 | −static void gadget_resume(struct usb_gadget *gadget) { } | |
| 384 | −static void gadget_reset(struct usb_gadget *gadget) { } | |
| 381 | +static void gadget_disconnect(struct usb_gadget *gadget) | |
| 382 | +{ | |
| 383 | + struct raw_dev *dev = get_gadget_data(gadget); | |
| 384 | + int ret; | |
| 385 | + | |
| 386 | + dev_dbg(&gadget->dev, "gadget disconnected\n"); | |
| 387 | + ret = raw_queue_event(dev, USB_RAW_EVENT_DISCONNECT, 0, NULL); | |
| 388 | + if (ret < 0) | |
| 389 | + dev_err(&gadget->dev, "failed to queue disconnect event\n"); | |
| 390 | +} | |
| 391 | +static void gadget_suspend(struct usb_gadget *gadget) | |
| 392 | +{ | |
| 393 | + struct raw_dev *dev = get_gadget_data(gadget); | |
| 394 | + int ret; | |
| 395 | + | |
| 396 | + dev_dbg(&gadget->dev, "gadget suspended\n"); | |
| 397 | + ret = raw_queue_event(dev, USB_RAW_EVENT_SUSPEND, 0, NULL); | |
| 398 | + if (ret < 0) | |
| 399 | + dev_err(&gadget->dev, "failed to queue suspend event\n"); | |
| 400 | +} | |
| 401 | +static void gadget_resume(struct usb_gadget *gadget) | |
| 402 | +{ | |
| 403 | + struct raw_dev *dev = get_gadget_data(gadget); | |
| 404 | + int ret; | |
| 405 | + | |
| 406 | + dev_dbg(&gadget->dev, "gadget resumed\n"); | |
| 407 | + ret = raw_queue_event(dev, USB_RAW_EVENT_RESUME, 0, NULL); | |
| 408 | + if (ret < 0) | |
| 409 | + dev_err(&gadget->dev, "failed to queue resume event\n"); | |
| 410 | +} | |
| 411 | +static void gadget_reset(struct usb_gadget *gadget) | |
| 412 | +{ | |
| 413 | + struct raw_dev *dev = get_gadget_data(gadget); | |
| 414 | + int ret; | |
| 415 | + | |
| 416 | + dev_dbg(&gadget->dev, "gadget reset\n"); | |
| 417 | + ret = raw_queue_event(dev, USB_RAW_EVENT_RESET, 0, NULL); | |
| 418 | + if (ret < 0) | |
| 419 | + dev_err(&gadget->dev, "failed to queue reset event\n"); | |
| 420 | +} | |
| 385 | 421 | |
| 386 | 422 | /*----------------------------------------------------------------------*/ |
| 387 | 423 | |
| @@ -44,6 +44,16 @@ enum usb_raw_event_type { · 43 unmodified lines | ||
| 44 | 44 | /* This event is queued when a new control request arrived to ep0. */ |
| 45 | 45 | USB_RAW_EVENT_CONTROL = 2, |
| 46 | 46 | |
| 47 | + /* | |
| 48 | + * These events are queued when the gadget driver is suspended, | |
| 49 | + * resumed, reset, or disconnected. Note that some UDCs (e.g. dwc2) | |
| 50 | + * report a disconnect event instead of a reset. | |
| 51 | + */ | |
| 52 | + USB_RAW_EVENT_SUSPEND = 3, | |
| 53 | + USB_RAW_EVENT_RESUME = 4, | |
| 54 | + USB_RAW_EVENT_RESET = 5, | |
| 55 | + USB_RAW_EVENT_DISCONNECT = 6, | |
| 56 | + | |
| 47 | 57 | /* The list might grow in the future. */ |
| 48 | 58 | }; |
| 49 | 59 | |
| @@ -54,8 +64,8 @@ enum usb_raw_event_type { · 4 unmodified lines | ||
| 54 | 64 | * actual length of the fetched event data. |
| 55 | 65 | * @data: A buffer to store the fetched event data. |
| 56 | 66 | * |
| 57 | − * Currently the fetched data buffer is empty for USB_RAW_EVENT_CONNECT, | |
| 58 | − * and contains struct usb_ctrlrequest for USB_RAW_EVENT_CONTROL. | |
| 67 | + * The fetched event data buffer contains struct usb_ctrlrequest for | |
| 68 | + * USB_RAW_EVENT_CONTROL and is empty for other events. | |
| 59 | 69 | */ |
| 60 | 70 | struct usb_raw_event { |
| 61 | 71 | __u32 type; |