I'm very confused by the location of the MaxBurst parameter.
All the dongles I've looked at seem to place MaxBurst just after MaxPacketSize,
and not in a separate descriptor (and don't place burst on the
status/config channel).
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 3
What does "lsusb -d ... -v" show from the host side?
Maybe things are pretty misconfigured? Or maybe the dongles don't
match the spec...
On Tue, Aug 18, 2020 at 9:59 AM Lorenzo Colitti <lorenzo@xxxxxxxxxx> wrote:
>
> Currently, using f_ncm in a SuperSpeed Plus gadget results in
> an oops in config_ep_by_speed because ncm_set_alt passes in NULL
> ssp_descriptors. Fix this by defining new descriptors for
> SuperSpeed Plus. (We cannot re-use the existing definitions for
> the SuperSpeed descriptors, even though they are mostly the same,
> because they are not fixed initializers).
>
> Tested: enabled f_ncm on a dwc3 gadget and 10Gbps link, ran iperf
> Signed-off-by: Lorenzo Colitti <lorenzo@xxxxxxxxxx>
> ---
> drivers/usb/gadget/function/f_ncm.c | 76 ++++++++++++++++++++++++++++-
> 1 file changed, 75 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
> index 57ccf30c6c..01242454d5 100644
> --- a/drivers/usb/gadget/function/f_ncm.c
> +++ b/drivers/usb/gadget/function/f_ncm.c
> @@ -400,6 +400,75 @@ static struct usb_descriptor_header *ncm_ss_function[] = {
> NULL,
> };
>
> +/* super speed plus support: */
> +
> +static struct usb_endpoint_descriptor ssp_ncm_notify_desc = {
> + .bLength = USB_DT_ENDPOINT_SIZE,
> + .bDescriptorType = USB_DT_ENDPOINT,
> +
> + .bEndpointAddress = USB_DIR_IN,
> + .bmAttributes = USB_ENDPOINT_XFER_INT,
> + .wMaxPacketSize = cpu_to_le16(NCM_STATUS_BYTECOUNT),
> + .bInterval = USB_MS_TO_HS_INTERVAL(NCM_STATUS_INTERVAL_MS)
> +};
> +
> +static struct usb_ss_ep_comp_descriptor ssp_ncm_notify_comp_desc = {
> + .bLength = sizeof(ssp_ncm_notify_comp_desc),
> + .bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
> +
> + /* the following 3 values can be tweaked if necessary */
> + .bMaxBurst = 15,
> + /* .bmAttributes = 0, */
> + .wBytesPerInterval = cpu_to_le16(NCM_STATUS_BYTECOUNT),
> +};
> +
> +static struct usb_endpoint_descriptor ssp_ncm_in_desc = {
> + .bLength = USB_DT_ENDPOINT_SIZE,
> + .bDescriptorType = USB_DT_ENDPOINT,
> +
> + .bEndpointAddress = USB_DIR_IN,
> + .bmAttributes = USB_ENDPOINT_XFER_BULK,
> + .wMaxPacketSize = cpu_to_le16(1024),
> +};
> +
> +static struct usb_endpoint_descriptor ssp_ncm_out_desc = {
> + .bLength = USB_DT_ENDPOINT_SIZE,
> + .bDescriptorType = USB_DT_ENDPOINT,
> +
> + .bEndpointAddress = USB_DIR_OUT,
> + .bmAttributes = USB_ENDPOINT_XFER_BULK,
> + .wMaxPacketSize = cpu_to_le16(1024),
> +};
> +
> +static struct usb_ss_ep_comp_descriptor ssp_ncm_bulk_comp_desc = {
> + .bLength = sizeof(ssp_ncm_bulk_comp_desc),
> + .bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
> +
> + /* the following 2 values can be tweaked if necessary */
> + .bMaxBurst = 15,
> + /* .bmAttributes = 0, */
> +};
> +
> +static struct usb_descriptor_header *ncm_ssp_function[] = {
> + (struct usb_descriptor_header *) &ncm_iad_desc,
> + /* CDC NCM control descriptors */
> + (struct usb_descriptor_header *) &ncm_control_intf,
> + (struct usb_descriptor_header *) &ncm_header_desc,
> + (struct usb_descriptor_header *) &ncm_union_desc,
> + (struct usb_descriptor_header *) &ecm_desc,
> + (struct usb_descriptor_header *) &ncm_desc,
> + (struct usb_descriptor_header *) &ssp_ncm_notify_desc,
> + (struct usb_descriptor_header *) &ssp_ncm_notify_comp_desc,
> + /* data interface, altsettings 0 and 1 */
> + (struct usb_descriptor_header *) &ncm_data_nop_intf,
> + (struct usb_descriptor_header *) &ncm_data_intf,
> + (struct usb_descriptor_header *) &ssp_ncm_in_desc,
> + (struct usb_descriptor_header *) &ssp_ncm_bulk_comp_desc,
> + (struct usb_descriptor_header *) &ssp_ncm_out_desc,
> + (struct usb_descriptor_header *) &ssp_ncm_bulk_comp_desc,
> + NULL,
> +};
> +
> /* string descriptors: */
>
> #define STRING_CTRL_IDX 0
> @@ -1502,8 +1571,13 @@ static int ncm_bind(struct usb_configuration *c, struct usb_function *f)
> ss_ncm_notify_desc.bEndpointAddress =
> fs_ncm_notify_desc.bEndpointAddress;
>
> + ssp_ncm_in_desc.bEndpointAddress = fs_ncm_in_desc.bEndpointAddress;
> + ssp_ncm_out_desc.bEndpointAddress = fs_ncm_out_desc.bEndpointAddress;
> + ssp_ncm_notify_desc.bEndpointAddress =
> + fs_ncm_notify_desc.bEndpointAddress;
> +
> status = usb_assign_descriptors(f, ncm_fs_function, ncm_hs_function,
> - ncm_ss_function, NULL);
> + ncm_ss_function, ncm_ssp_function);
> if (status)
> goto fail;
>
> --
> 2.28.0.220.ged08abb693-goog
>
