d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb(4): Call optional endpoint_uninit() when changing configuration or alternate setting.

Browse Source 
MFC after:	1 week
Sponsored by:	NVIDIA Networking
This commit is contained in:
Hans Petter Selasky 2022-12-15 23:32:47 +01:00
parent 933be8d74b
commit e4611d2626
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
sys/dev/usb/usb_device.c
View File

@ -841,38 +841,53 @@ usb_config_parse(struct usb_device *udev, uint8_t iface_index, uint8_t cmd)
DPRINTFN(5, "iface_index=%d cmd=%d\n",
iface_index, cmd);
if (cmd == USB_CFG_FREE)
goto cleanup;
if (cmd == USB_CFG_INIT) {
if (cmd == USB_CFG_INIT || cmd == USB_CFG_FREE) {
sx_assert(&udev->enum_sx, SA_LOCKED);
/* check for in-use endpoints */
if (cmd == USB_CFG_INIT) {
ep = udev->endpoints;
ep_max = udev->endpoints_max;
while (ep_max--) {
/* look for matching endpoints */
if (iface_index == USB_IFACE_INDEX_ANY ||
iface_index == ep->iface_index) {
if (ep->refcount_alloc != 0)
return (USB_ERR_IN_USE);
}
}
}
ep = udev->endpoints;
ep_max = udev->endpoints_max;
while (ep_max--) {
/* look for matching endpoints */
if ((iface_index == USB_IFACE_INDEX_ANY) ||
(iface_index == ep->iface_index)) {
if (ep->refcount_alloc != 0) {
/*
* This typically indicates a
* more serious error.
*/
err = USB_ERR_IN_USE;
} else {
/* reset endpoint */
memset(ep, 0, sizeof(*ep));
/* make sure we don't zero the endpoint again */
ep->iface_index = USB_IFACE_INDEX_ANY;
}
if (iface_index == USB_IFACE_INDEX_ANY ||
iface_index == ep->iface_index) {
/*
* Check if hardware needs a callback
* to unconfigure the endpoint. This
* may happen multiple times,
* because the requested alternate
* setting may fail. The callback
* implementation should be aware of
* and handle that.
*/
if (ep->edesc != NULL &&
udev->bus->methods->endpoint_uninit != NULL)
udev->bus->methods->endpoint_uninit(udev, ep);
/* reset endpoint */
memset(ep, 0, sizeof(*ep));
/* make sure we don't zero the endpoint again */
ep->iface_index = USB_IFACE_INDEX_ANY;
}
ep++;
}
if (err)
return (err);
if (cmd == USB_CFG_FREE)
goto cleanup;
}
memset(&ips, 0, sizeof(ips));