Skip to content

Commit

Permalink
usb: add plumbing for updating interrupt endpoint interval state
Browse files Browse the repository at this point in the history
xHCI caches device and endpoint data after the interface is configured,
so an explicit command needs to be issued for any device driver wanting
to alter the polling interval of an endpoint.

Add usb_fixup_endpoint() to allow drivers to do this. The fixup must be
called after calculating endpoint bandwidth requirements but before any
URBs are submitted.

If polling intervals are shortened, any bandwidth reservations are no
longer valid but in practice polling intervals are only ever relaxed.

Limit the scope to interrupt transfers for now.

Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  • Loading branch information
Jonathan Bell authored and popcornmix committed Apr 29, 2024
1 parent 998dcc0 commit 7c517e7
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 0 deletions.
10 changes: 10 additions & 0 deletions drivers/usb/core/hcd.c
Expand Up @@ -1952,6 +1952,16 @@ int usb_hcd_alloc_bandwidth(struct usb_device *udev,
return ret;
}

void usb_hcd_fixup_endpoint(struct usb_device *udev,
struct usb_host_endpoint *ep, int interval)
{
struct usb_hcd *hcd;

hcd = bus_to_hcd(udev->bus);
if (hcd->driver->fixup_endpoint)
hcd->driver->fixup_endpoint(hcd, udev, ep, interval);
}

/* Disables the endpoint: synchronizes with the hcd to make sure all
* endpoint state is gone from hardware. usb_hcd_flush_endpoint() must
* have been called previously. Use for set_configuration, set_interface,
Expand Down
15 changes: 15 additions & 0 deletions drivers/usb/core/message.c
Expand Up @@ -1265,6 +1265,21 @@ static void remove_intf_ep_devs(struct usb_interface *intf)
intf->ep_devs_created = 0;
}

void usb_fixup_endpoint(struct usb_device *dev, int epaddr, int interval)
{
unsigned int epnum = epaddr & USB_ENDPOINT_NUMBER_MASK;
struct usb_host_endpoint *ep;

if (usb_endpoint_out(epaddr))
ep = dev->ep_out[epnum];
else
ep = dev->ep_in[epnum];

if (ep && usb_endpoint_xfer_int(&ep->desc))
usb_hcd_fixup_endpoint(dev, ep, interval);
}
EXPORT_SYMBOL_GPL(usb_fixup_endpoint);

/**
* usb_disable_endpoint -- Disable an endpoint by address
* @dev: the device whose endpoint is being disabled
Expand Down
2 changes: 2 additions & 0 deletions include/linux/usb.h
Expand Up @@ -1888,6 +1888,8 @@ extern int usb_clear_halt(struct usb_device *dev, int pipe);
extern int usb_reset_configuration(struct usb_device *dev);
extern int usb_set_interface(struct usb_device *dev, int ifnum, int alternate);
extern void usb_reset_endpoint(struct usb_device *dev, unsigned int epaddr);
extern void usb_fixup_endpoint(struct usb_device *dev, int epaddr,
int interval);

/* this request isn't really synchronous, but it belongs with the others */
extern int usb_driver_set_configuration(struct usb_device *udev, int config);
Expand Down
7 changes: 7 additions & 0 deletions include/linux/usb/hcd.h
Expand Up @@ -372,6 +372,11 @@ struct hc_driver {
* or bandwidth constraints.
*/
void (*reset_bandwidth)(struct usb_hcd *, struct usb_device *);
/* Override the endpoint-derived interval
* (if there is any cached hardware state).
*/
void (*fixup_endpoint)(struct usb_hcd *hcd, struct usb_device *udev,
struct usb_host_endpoint *ep, int interval);
/* Set the hardware-chosen device address */
int (*address_device)(struct usb_hcd *, struct usb_device *udev,
unsigned int timeout_ms);
Expand Down Expand Up @@ -437,6 +442,8 @@ extern void usb_hcd_unmap_urb_setup_for_dma(struct usb_hcd *, struct urb *);
extern void usb_hcd_unmap_urb_for_dma(struct usb_hcd *, struct urb *);
extern void usb_hcd_flush_endpoint(struct usb_device *udev,
struct usb_host_endpoint *ep);
extern void usb_hcd_fixup_endpoint(struct usb_device *udev,
struct usb_host_endpoint *ep, int interval);
extern void usb_hcd_disable_endpoint(struct usb_device *udev,
struct usb_host_endpoint *ep);
extern void usb_hcd_reset_endpoint(struct usb_device *udev,
Expand Down

0 comments on commit 7c517e7

Please sign in to comment.