usb: misc: usbtest: add super-speed isoc support
PATCH 1/1 usb: misc: usbtest: add super-speed isoc support
The calculation of packet number within microframe is different between high-speed and super-speed endpoint, we add support for super-speed in this patch.
Cc Pawel Laszczak <[email protected]>
Signed-off-by Peter Chen <[email protected]>
--- drivers/usb/misc/usbtest.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)
drivers/usb/misc/usbtest.c +24 -4
@@ -347,6 +347,14 @@ static unsigned get_maxpacket(struct usb_device *udev, int pipe)return le16_to_cpup (&ep->desc.wMaxPacketSize); } +static int ss_isoc_get_packet_num (struct usb_device *udev,int pipe) +{ +struct usb_host_endpoint *ep =usb_pipe_endpoint (udev, pipe); + +return USB_SS_MULT (ep->ss_ep_comp.bmAttributes) + * (1 + ep->ss_ep_comp.bMaxBurst); +} +static void simple_fill_buf (struct urb *urb) {unsigned i;
@@ -1976,8 +1984,13 @@ static struct urb *iso_alloc_urb(if (bytes <0 || !desc)return NULL ; + maxp =usb_endpoint_maxp (desc); - maxp *=usb_endpoint_maxp_mult (desc); +if (udev->speed >=USB_SPEED_SUPER ) + maxp *=ss_isoc_get_packet_num (udev, pipe); +else + maxp *=usb_endpoint_maxp_mult (desc); + packets =DIV_ROUND_UP (bytes, maxp); urb =usb_alloc_urb (packets,GFP_KERNEL );
@@ -2065,17 +2078,24 @@ test_queue(struct usbtest_dev *dev, struct usbtest_param_32 *param, packets *= param->iterations;if (context.is_iso) { +int transaction_num; + +if (udev->speed >=USB_SPEED_SUPER ) + transaction_num =ss_isoc_get_packet_num (udev, pipe); +else + transaction_num =usb_endpoint_maxp_mult (desc); +dev_info (&dev->intf->dev,"iso period %d %sframes, wMaxPacket %d, transactions: %d\n" ,1 << (desc->bInterval -1 ), - (udev->speed ==USB_SPEED_HIGH ) ?"micro" :"" , + (udev->speed >=USB_SPEED_HIGH ) ?"micro" :"" ,usb_endpoint_maxp (desc), -usb_endpoint_maxp_mult (desc)); + transaction_num);dev_info (&dev->intf->dev,"total %lu msec (%lu packets)\n" , (packets * (1 << (desc->bInterval -1 ))) - / ((udev->speed ==USB_SPEED_HIGH ) ?8 :1 ), + / ((udev->speed >=USB_SPEED_HIGH ) ?8 :1 ), packets); }