Re: [RFC PATCH] usb:gadget: Fixed issue with config_ep_by_speed function.

From: Peter Chen
Date: Wed Dec 04 2019 - 02:57:55 EST

Next message: Alexandru Ardelean: "[PATCH] NFC: NCI: use new `delay` structure for SPI transfer delays"
Previous message: Johan Hovold: "Re: [PATCH v4 2/2] usb: overridable hub bInterval by device node"
In reply to: Jayshri Pawar: "[RFC PATCH] usb:gadget: Fixed issue with config_ep_by_speed function."
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On 19-12-02 12:07:27, Jayshri Pawar wrote:
> This patch adds additional parameter alt to config_ep_by_speed function.
> This additional parameter allows to improve this function and
> find proper usb_ss_ep_comp_descriptor.
>
> Problem has appeared during testing f_tcm (BOT/UAS) driver function.
>
> f_tcm function for SS use array of headers for both BOT/UAS alternate
> setting:
>
> static struct usb_descriptor_header *uasp_ss_function_desc[] = {
> (struct usb_descriptor_header *) &bot_intf_desc,
> (struct usb_descriptor_header *) &uasp_ss_bi_desc,
> (struct usb_descriptor_header *) &bot_bi_ep_comp_desc,
> (struct usb_descriptor_header *) &uasp_ss_bo_desc,
> (struct usb_descriptor_header *) &bot_bo_ep_comp_desc,
>
> (struct usb_descriptor_header *) &uasp_intf_desc,
> (struct usb_descriptor_header *) &uasp_ss_bi_desc,
> (struct usb_descriptor_header *) &uasp_bi_ep_comp_desc,
> (struct usb_descriptor_header *) &uasp_bi_pipe_desc,
> (struct usb_descriptor_header *) &uasp_ss_bo_desc,
> (struct usb_descriptor_header *) &uasp_bo_ep_comp_desc,
> (struct usb_descriptor_header *) &uasp_bo_pipe_desc,
> (struct usb_descriptor_header *) &uasp_ss_status_desc,
> (struct usb_descriptor_header *) &uasp_status_in_ep_comp_desc,
> (struct usb_descriptor_header *) &uasp_status_pipe_desc,
> (struct usb_descriptor_header *) &uasp_ss_cmd_desc,
> (struct usb_descriptor_header *) &uasp_cmd_comp_desc,
> (struct usb_descriptor_header *) &uasp_cmd_pipe_desc,
> NULL,
> };
>
> The first 5 descriptors are associated with BOT alternate setting,
> and others are associated with UAS.
>
> During handling UAS alternate setting f_tcm drivr invokes
> config_ep_by_speed and this function sets incorrect companion endpoint
> descriptor in usb_ep object.
>
> Instead setting ep->comp_desc to uasp_bi_ep_comp_desc function in this
> case set ep->comp_desc to uasp_ss_bi_desc.
>
> This is due to the fact that it search endpoint based on endpoint
> address:
>
> for_each_ep_desc(speed_desc, d_spd) {
> chosen_desc = (struct usb_endpoint_descriptor *)*d_spd;
> if (chosen_desc->bEndpoitAddress == _ep->address)
> goto ep_found;
> }
>
> And in result it uses the descriptor from BOT alternate setting
> instead UAS.
>
> Finally, it causes that controller driver during enabling endpoints
> detect that just enabled endpoint is not stream capable.

enabled endpoint for bot.

>
> Signed-off-by: Pawel Laszczak <pawell@xxxxxxxxxxx>
> Signed-off-by: Jayshri Pawar <jpawar@xxxxxxxxxxx>
> ---
> drivers/usb/gadget/composite.c | 42 ++++++++++++++------
> drivers/usb/gadget/function/f_acm.c | 7 ++--
> drivers/usb/gadget/function/f_ecm.c | 7 ++--
> drivers/usb/gadget/function/f_eem.c | 4 +-
> drivers/usb/gadget/function/f_fs.c | 3 +-
> drivers/usb/gadget/function/f_hid.c | 4 +-
> drivers/usb/gadget/function/f_loopback.c | 2 +-
> drivers/usb/gadget/function/f_mass_storage.c | 5 ++-
> drivers/usb/gadget/function/f_midi.c | 2 +-
> drivers/usb/gadget/function/f_ncm.c | 7 ++--
> drivers/usb/gadget/function/f_obex.c | 4 +-
> drivers/usb/gadget/function/f_phonet.c | 4 +-
> drivers/usb/gadget/function/f_rndis.c | 7 ++--
> drivers/usb/gadget/function/f_serial.c | 4 +-
> drivers/usb/gadget/function/f_sourcesink.c | 11 +++--
> drivers/usb/gadget/function/f_subset.c | 4 +-
> drivers/usb/gadget/function/f_tcm.c | 12 +++---
> drivers/usb/gadget/function/f_uac1_legacy.c | 2 +-
> drivers/usb/gadget/function/f_uvc.c | 5 ++-
> drivers/usb/gadget/function/u_audio.c | 4 +-
> include/linux/usb/composite.h | 2 +-
> 21 files changed, 85 insertions(+), 57 deletions(-)
>
> diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
> index bb0c744d5b44..b2ced8a7b591 100644
> --- a/drivers/usb/gadget/composite.c
> +++ b/drivers/usb/gadget/composite.c
> @@ -96,33 +96,35 @@ function_descriptors(struct usb_function *f,
> }
>
> /**
> - * next_ep_desc() - advance to the next EP descriptor
> + * next_for_each_desc_desc() - advance to the next desc_type descriptor

%s/next_for_each_desc_desc/next_desc

> * @t: currect pointer within descriptor array
> + * @desc_type: descriptor type
> *
> - * Return: next EP descriptor or NULL
> + * Return: next desc_type descriptor or NULL
> *
> - * Iterate over @t until either EP descriptor found or
> + * Iterate over @t until either desc_type descriptor found or
> * NULL (that indicates end of list) encountered
> */
> static struct usb_descriptor_header**
> -next_ep_desc(struct usb_descriptor_header **t)
> +next_desc(struct usb_descriptor_header **t, u8 desc_type)
> {
> for (; *t; t++) {
> - if ((*t)->bDescriptorType == USB_DT_ENDPOINT)
> + if ((*t)->bDescriptorType == desc_type)
> return t;
> }
> return NULL;
> }
>
> /*
> - * for_each_ep_desc()- iterate over endpoint descriptors in the
> + * for_each_desc()- iterate over desc_type descriptors in the
> * descriptors list
> * @start: pointer within descriptor array.
> - * @ep_desc: endpoint descriptor to use as the loop cursor
> + * @iter_desc: desc_type descriptor to use as the loop cursor
> + * @desc_type wanted descriptr type

Align the comment format please.

> */
> -#define for_each_ep_desc(start, ep_desc) \
> - for (ep_desc = next_ep_desc(start); \
> - ep_desc; ep_desc = next_ep_desc(ep_desc+1))
> +#define for_each_desc(start, iter_desc, desc_type) \
> + for (iter_desc = next_desc(start, desc_type); \
> + iter_desc; iter_desc = next_desc(iter_desc + 1, desc_type))
>
> /**
> * config_ep_by_speed() - configures the given endpoint
> @@ -144,9 +146,11 @@ next_ep_desc(struct usb_descriptor_header **t)
> */

You may update the kernel doc accordingly.
And u8 is ok for the parameter 'alt'.

> int config_ep_by_speed(struct usb_gadget *g,
> struct usb_function *f,
> - struct usb_ep *_ep)
> + struct usb_ep *_ep,
> + unsigned alt)
> {
> struct usb_endpoint_descriptor *chosen_desc = NULL;
> + struct usb_interface_descriptor *int_desc = NULL;
> struct usb_descriptor_header **speed_desc = NULL;
>
> struct usb_ss_ep_comp_descriptor *comp_desc = NULL;
> @@ -182,9 +186,23 @@ int config_ep_by_speed(struct usb_gadget *g,
> default:
> speed_desc = f->fs_descriptors;
> }
> +
> + /* find correct alternate setting descriptor */
> + for_each_desc(speed_desc, d_spd, USB_DT_INTERFACE) {
> + int_desc = (struct usb_interface_descriptor *)*d_spd;
> +
> + if (int_desc->bAlternateSetting == alt) {
> + speed_desc = d_spd;
> + goto intf_found;
> + }
> + }
> + return -EIO;
> +
> +intf_found:
> /* find descriptors */
> - for_each_ep_desc(speed_desc, d_spd) {
> + for_each_desc(speed_desc, d_spd, USB_DT_ENDPOINT) {
> chosen_desc = (struct usb_endpoint_descriptor *)*d_spd;
> +

Blank line is not needed.

Peter

> if (chosen_desc->bEndpointAddress == _ep->address)
> goto ep_found;
> }
> diff --git a/drivers/usb/gadget/function/f_acm.c b/drivers/usb/gadget/function/f_acm.c
> index 7c152c28b26c..0be4a07f1624 100644
> --- a/drivers/usb/gadget/function/f_acm.c
> +++ b/drivers/usb/gadget/function/f_acm.c
> @@ -430,7 +430,8 @@ static int acm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
> usb_ep_disable(acm->notify);
>
> if (!acm->notify->desc)
> - if (config_ep_by_speed(cdev->gadget, f, acm->notify))
> + if (config_ep_by_speed(cdev->gadget, f,
> + acm->notify, alt))
> return -EINVAL;
>
> usb_ep_enable(acm->notify);
> @@ -445,9 +446,9 @@ static int acm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
> dev_dbg(&cdev->gadget->dev,
> "activate acm ttyGS%d\n", acm->port_num);
> if (config_ep_by_speed(cdev->gadget, f,
> - acm->port.in) ||
> + acm->port.in, alt) ||
> config_ep_by_speed(cdev->gadget, f,
> - acm->port.out)) {
> + acm->port.out, alt)) {
> acm->port.in->desc = NULL;
> acm->port.out->desc = NULL;
> return -EINVAL;
> diff --git a/drivers/usb/gadget/function/f_ecm.c b/drivers/usb/gadget/function/f_ecm.c
> index 6ce044008cf6..6ff82bd8b921 100644
> --- a/drivers/usb/gadget/function/f_ecm.c
> +++ b/drivers/usb/gadget/function/f_ecm.c
> @@ -541,7 +541,8 @@ static int ecm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
> usb_ep_disable(ecm->notify);
> if (!(ecm->notify->desc)) {
> VDBG(cdev, "init ecm ctrl %d\n", intf);
> - if (config_ep_by_speed(cdev->gadget, f, ecm->notify))
> + if (config_ep_by_speed(cdev->gadget, f,
> + ecm->notify, alt))
> goto fail;
> }
> usb_ep_enable(ecm->notify);
> @@ -560,9 +561,9 @@ static int ecm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
> !ecm->port.out_ep->desc) {
> DBG(cdev, "init ecm\n");
> if (config_ep_by_speed(cdev->gadget, f,
> - ecm->port.in_ep) ||
> + ecm->port.in_ep, alt) ||
> config_ep_by_speed(cdev->gadget, f,
> - ecm->port.out_ep)) {
> + ecm->port.out_ep, alt)) {
> ecm->port.in_ep->desc = NULL;
> ecm->port.out_ep->desc = NULL;
> goto fail;
> diff --git a/drivers/usb/gadget/function/f_eem.c b/drivers/usb/gadget/function/f_eem.c
> index b81a91d504bd..2cfb1ceb45f1 100644
> --- a/drivers/usb/gadget/function/f_eem.c
> +++ b/drivers/usb/gadget/function/f_eem.c
> @@ -196,9 +196,9 @@ static int eem_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
> if (!eem->port.in_ep->desc || !eem->port.out_ep->desc) {
> DBG(cdev, "init eem\n");
> if (config_ep_by_speed(cdev->gadget, f,
> - eem->port.in_ep) ||
> + eem->port.in_ep, alt) ||
> config_ep_by_speed(cdev->gadget, f,
> - eem->port.out_ep)) {
> + eem->port.out_ep, alt)) {
> eem->port.in_ep->desc = NULL;
> eem->port.out_ep->desc = NULL;
> goto fail;
> diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
> index 59d9d512dcda..0dcbc44298a9 100644
> --- a/drivers/usb/gadget/function/f_fs.c
> +++ b/drivers/usb/gadget/function/f_fs.c
> @@ -1963,7 +1963,8 @@ static int ffs_func_eps_enable(struct ffs_function *func)
> while(count--) {
> ep->ep->driver_data = ep;
>
> - ret = config_ep_by_speed(func->gadget, &func->function, ep->ep);
> + ret = config_ep_by_speed(func->gadget, &func->function,
> + ep->ep, 0);
> if (ret) {
> pr_err("%s: config_ep_by_speed(%s) returned %d\n",
> __func__, ep->ep->name, ret);
> diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
> index f3816a5c861e..9cbf622dc33c 100644
> --- a/drivers/usb/gadget/function/f_hid.c
> +++ b/drivers/usb/gadget/function/f_hid.c
> @@ -647,7 +647,7 @@ static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
> usb_ep_disable(hidg->in_ep);
>
> status = config_ep_by_speed(f->config->cdev->gadget, f,
> - hidg->in_ep);
> + hidg->in_ep, alt);
> if (status) {
> ERROR(cdev, "config_ep_by_speed FAILED!\n");
> goto fail;
> @@ -672,7 +672,7 @@ static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
> usb_ep_disable(hidg->out_ep);
>
> status = config_ep_by_speed(f->config->cdev->gadget, f,
> - hidg->out_ep);
> + hidg->out_ep, alt);
> if (status) {
> ERROR(cdev, "config_ep_by_speed FAILED!\n");
> goto free_req_in;
> diff --git a/drivers/usb/gadget/function/f_loopback.c b/drivers/usb/gadget/function/f_loopback.c
> index 1803646b3678..6ff45212bf8e 100644
> --- a/drivers/usb/gadget/function/f_loopback.c
> +++ b/drivers/usb/gadget/function/f_loopback.c
> @@ -362,7 +362,7 @@ static int enable_endpoint(struct usb_composite_dev *cdev,
> {
> int result;
>
> - result = config_ep_by_speed(cdev->gadget, &(loop->function), ep);
> + result = config_ep_by_speed(cdev->gadget, &loop->function, ep, 0);
> if (result)
> goto out;
>
> diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c
> index 7c96c4665178..9aa9fd4e4785 100644
> --- a/drivers/usb/gadget/function/f_mass_storage.c
> +++ b/drivers/usb/gadget/function/f_mass_storage.c
> @@ -2241,7 +2241,8 @@ static int do_set_interface(struct fsg_common *common, struct fsg_dev *new_fsg)
> fsg = common->fsg;
>
> /* Enable the endpoints */
> - rc = config_ep_by_speed(common->gadget, &(fsg->function), fsg->bulk_in);
> + rc = config_ep_by_speed(common->gadget, &fsg->function,
> + fsg->bulk_in, 0);
> if (rc)
> goto reset;
> rc = usb_ep_enable(fsg->bulk_in);
> @@ -2251,7 +2252,7 @@ static int do_set_interface(struct fsg_common *common, struct fsg_dev *new_fsg)
> fsg->bulk_in_enabled = 1;
>
> rc = config_ep_by_speed(common->gadget, &(fsg->function),
> - fsg->bulk_out);
> + fsg->bulk_out, 0);
> if (rc)
> goto reset;
> rc = usb_ep_enable(fsg->bulk_out);
> diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
> index 46af0aa07e2e..f371ef38a251 100644
> --- a/drivers/usb/gadget/function/f_midi.c
> +++ b/drivers/usb/gadget/function/f_midi.c
> @@ -343,7 +343,7 @@ static int f_midi_start_ep(struct f_midi *midi,
>
> usb_ep_disable(ep);
>
> - err = config_ep_by_speed(midi->gadget, f, ep);
> + err = config_ep_by_speed(midi->gadget, f, ep, 0);
> if (err) {
> ERROR(cdev, "can't configure %s: %d\n", ep->name, err);
> return err;
> diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
> index 2d6e76e4cffa..168412be9964 100644
> --- a/drivers/usb/gadget/function/f_ncm.c
> +++ b/drivers/usb/gadget/function/f_ncm.c
> @@ -872,7 +872,8 @@ static int ncm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
>
> if (!(ncm->notify->desc)) {
> DBG(cdev, "init ncm ctrl %d\n", intf);
> - if (config_ep_by_speed(cdev->gadget, f, ncm->notify))
> + if (config_ep_by_speed(cdev->gadget, f,
> + ncm->notify, alt))
> goto fail;
> }
> usb_ep_enable(ncm->notify);
> @@ -901,9 +902,9 @@ static int ncm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
> !ncm->port.out_ep->desc) {
> DBG(cdev, "init ncm\n");
> if (config_ep_by_speed(cdev->gadget, f,
> - ncm->port.in_ep) ||
> + ncm->port.in_ep, alt) ||
> config_ep_by_speed(cdev->gadget, f,
> - ncm->port.out_ep)) {
> + ncm->port.out_ep, alt)) {
> ncm->port.in_ep->desc = NULL;
> ncm->port.out_ep->desc = NULL;
> goto fail;
> diff --git a/drivers/usb/gadget/function/f_obex.c b/drivers/usb/gadget/function/f_obex.c
> index ab26d84ed95e..bacceced3bba 100644
> --- a/drivers/usb/gadget/function/f_obex.c
> +++ b/drivers/usb/gadget/function/f_obex.c
> @@ -212,9 +212,9 @@ static int obex_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
> dev_dbg(&cdev->gadget->dev,
> "init obex ttyGS%d\n", obex->port_num);
> if (config_ep_by_speed(cdev->gadget, f,
> - obex->port.in) ||
> + obex->port.in, alt) ||
> config_ep_by_speed(cdev->gadget, f,
> - obex->port.out)) {
> + obex->port.out, alt)) {
> obex->port.out->desc = NULL;
> obex->port.in->desc = NULL;
> goto fail;
> diff --git a/drivers/usb/gadget/function/f_phonet.c b/drivers/usb/gadget/function/f_phonet.c
> index 8b72b192c747..e1f04447c6da 100644
> --- a/drivers/usb/gadget/function/f_phonet.c
> +++ b/drivers/usb/gadget/function/f_phonet.c
> @@ -416,8 +416,8 @@ static int pn_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
> if (alt == 1) {
> int i;
>
> - if (config_ep_by_speed(gadget, f, fp->in_ep) ||
> - config_ep_by_speed(gadget, f, fp->out_ep)) {
> + if (config_ep_by_speed(gadget, f, fp->in_ep, alt) ||
> + config_ep_by_speed(gadget, f, fp->out_ep, alt)) {
> fp->in_ep->desc = NULL;
> fp->out_ep->desc = NULL;
> spin_unlock(&port->lock);
> diff --git a/drivers/usb/gadget/function/f_rndis.c b/drivers/usb/gadget/function/f_rndis.c
> index d48df36622b7..1d3497bcb808 100644
> --- a/drivers/usb/gadget/function/f_rndis.c
> +++ b/drivers/usb/gadget/function/f_rndis.c
> @@ -547,7 +547,8 @@ static int rndis_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
>
> if (!rndis->notify->desc) {
> VDBG(cdev, "init rndis ctrl %d\n", intf);
> - if (config_ep_by_speed(cdev->gadget, f, rndis->notify))
> + if (config_ep_by_speed(cdev->gadget, f,
> + rndis->notify, alt))
> goto fail;
> }
> usb_ep_enable(rndis->notify);
> @@ -563,9 +564,9 @@ static int rndis_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
> if (!rndis->port.in_ep->desc || !rndis->port.out_ep->desc) {
> DBG(cdev, "init rndis\n");
> if (config_ep_by_speed(cdev->gadget, f,
> - rndis->port.in_ep) ||
> + rndis->port.in_ep, alt) ||
> config_ep_by_speed(cdev->gadget, f,
> - rndis->port.out_ep)) {
> + rndis->port.out_ep, alt)) {
> rndis->port.in_ep->desc = NULL;
> rndis->port.out_ep->desc = NULL;
> goto fail;
> diff --git a/drivers/usb/gadget/function/f_serial.c b/drivers/usb/gadget/function/f_serial.c
> index 1406255d0865..784455c57dd5 100644
> --- a/drivers/usb/gadget/function/f_serial.c
> +++ b/drivers/usb/gadget/function/f_serial.c
> @@ -158,8 +158,8 @@ static int gser_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
> if (!gser->port.in->desc || !gser->port.out->desc) {
> dev_dbg(&cdev->gadget->dev,
> "activate generic ttyGS%d\n", gser->port_num);
> - if (config_ep_by_speed(cdev->gadget, f, gser->port.in) ||
> - config_ep_by_speed(cdev->gadget, f, gser->port.out)) {
> + if (config_ep_by_speed(cdev->gadget, f, gser->port.in, alt) ||
> + config_ep_by_speed(cdev->gadget, f, gser->port.out, alt)) {
> gser->port.in->desc = NULL;
> gser->port.out->desc = NULL;
> return -EINVAL;
> diff --git a/drivers/usb/gadget/function/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c
> index ed68a4860b7d..86124149de7d 100644
> --- a/drivers/usb/gadget/function/f_sourcesink.c
> +++ b/drivers/usb/gadget/function/f_sourcesink.c
> @@ -650,7 +650,8 @@ enable_source_sink(struct usb_composite_dev *cdev, struct f_sourcesink *ss,
>
> /* one bulk endpoint writes (sources) zeroes IN (to the host) */
> ep = ss->in_ep;
> - result = config_ep_by_speed(cdev->gadget, &(ss->function), ep);
> + result = config_ep_by_speed(cdev->gadget, &ss->function,
> + ep, alt);
> if (result)
> return result;
> result = usb_ep_enable(ep);
> @@ -668,7 +669,7 @@ enable_source_sink(struct usb_composite_dev *cdev, struct f_sourcesink *ss,
>
> /* one bulk endpoint reads (sinks) anything OUT (from the host) */
> ep = ss->out_ep;
> - result = config_ep_by_speed(cdev->gadget, &(ss->function), ep);
> + result = config_ep_by_speed(cdev->gadget, &ss->function, ep, alt);
> if (result)
> goto fail;
> result = usb_ep_enable(ep);
> @@ -690,7 +691,8 @@ enable_source_sink(struct usb_composite_dev *cdev, struct f_sourcesink *ss,
> /* one iso endpoint writes (sources) zeroes IN (to the host) */
> ep = ss->iso_in_ep;
> if (ep) {
> - result = config_ep_by_speed(cdev->gadget, &(ss->function), ep);
> + result = config_ep_by_speed(cdev->gadget, &ss->function,
> + ep, alt);
> if (result)
> goto fail2;
> result = usb_ep_enable(ep);
> @@ -711,7 +713,8 @@ enable_source_sink(struct usb_composite_dev *cdev, struct f_sourcesink *ss,
> /* one iso endpoint reads (sinks) anything OUT (from the host) */
> ep = ss->iso_out_ep;
> if (ep) {
> - result = config_ep_by_speed(cdev->gadget, &(ss->function), ep);
> + result = config_ep_by_speed(cdev->gadget, &ss->function,
> + ep, alt);
> if (result)
> goto fail3;
> result = usb_ep_enable(ep);
> diff --git a/drivers/usb/gadget/function/f_subset.c b/drivers/usb/gadget/function/f_subset.c
> index 4d945254905d..5362ae567f6c 100644
> --- a/drivers/usb/gadget/function/f_subset.c
> +++ b/drivers/usb/gadget/function/f_subset.c
> @@ -264,8 +264,8 @@ static int geth_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
> }
>
> DBG(cdev, "init + activate cdc subset\n");
> - if (config_ep_by_speed(cdev->gadget, f, geth->port.in_ep) ||
> - config_ep_by_speed(cdev->gadget, f, geth->port.out_ep)) {
> + if (config_ep_by_speed(cdev->gadget, f, geth->port.in_ep, alt) ||
> + config_ep_by_speed(cdev->gadget, f, geth->port.out_ep, alt)) {
> geth->port.in_ep->desc = NULL;
> geth->port.out_ep->desc = NULL;
> return -EINVAL;
> diff --git a/drivers/usb/gadget/function/f_tcm.c b/drivers/usb/gadget/function/f_tcm.c
> index 36504931b2d1..0d9fa4637414 100644
> --- a/drivers/usb/gadget/function/f_tcm.c
> +++ b/drivers/usb/gadget/function/f_tcm.c
> @@ -392,12 +392,12 @@ static void bot_set_alt(struct f_uas *fu)
>
> fu->flags = USBG_IS_BOT;
>
> - config_ep_by_speed(gadget, f, fu->ep_in);
> + config_ep_by_speed(gadget, f, fu->ep_in, USB_G_ALT_INT_BBB);
> ret = usb_ep_enable(fu->ep_in);
> if (ret)
> goto err_b_in;
>
> - config_ep_by_speed(gadget, f, fu->ep_out);
> + config_ep_by_speed(gadget, f, fu->ep_out, USB_G_ALT_INT_BBB);
> ret = usb_ep_enable(fu->ep_out);
> if (ret)
> goto err_b_out;
> @@ -849,21 +849,21 @@ static void uasp_set_alt(struct f_uas *fu)
> if (gadget->speed >= USB_SPEED_SUPER)
> fu->flags |= USBG_USE_STREAMS;
>
> - config_ep_by_speed(gadget, f, fu->ep_in);
> + config_ep_by_speed(gadget, f, fu->ep_in, USB_G_ALT_INT_UAS);
> ret = usb_ep_enable(fu->ep_in);
> if (ret)
> goto err_b_in;
>
> - config_ep_by_speed(gadget, f, fu->ep_out);
> + config_ep_by_speed(gadget, f, fu->ep_out, USB_G_ALT_INT_UAS);
> ret = usb_ep_enable(fu->ep_out);
> if (ret)
> goto err_b_out;
>
> - config_ep_by_speed(gadget, f, fu->ep_cmd);
> + config_ep_by_speed(gadget, f, fu->ep_cmd, USB_G_ALT_INT_UAS);
> ret = usb_ep_enable(fu->ep_cmd);
> if (ret)
> goto err_cmd;
> - config_ep_by_speed(gadget, f, fu->ep_status);
> + config_ep_by_speed(gadget, f, fu->ep_status, USB_G_ALT_INT_UAS);
> ret = usb_ep_enable(fu->ep_status);
> if (ret)
> goto err_status;
> diff --git a/drivers/usb/gadget/function/f_uac1_legacy.c b/drivers/usb/gadget/function/f_uac1_legacy.c
> index 6677ae932de0..3db9ae71a452 100644
> --- a/drivers/usb/gadget/function/f_uac1_legacy.c
> +++ b/drivers/usb/gadget/function/f_uac1_legacy.c
> @@ -601,7 +601,7 @@ static int f_audio_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
> return 0;
> } else if (intf == audio->as_intf) {
> if (alt == 1) {
> - err = config_ep_by_speed(cdev->gadget, f, out_ep);
> + err = config_ep_by_speed(cdev->gadget, f, out_ep, alt);
> if (err)
> return err;
>
> diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
> index fb0a892687c0..7d4a479baebb 100644
> --- a/drivers/usb/gadget/function/f_uvc.c
> +++ b/drivers/usb/gadget/function/f_uvc.c
> @@ -290,7 +290,8 @@ uvc_function_set_alt(struct usb_function *f, unsigned interface, unsigned alt)
> usb_ep_disable(uvc->control_ep);
>
> if (!uvc->control_ep->desc)
> - if (config_ep_by_speed(cdev->gadget, f, uvc->control_ep))
> + if (config_ep_by_speed(cdev->gadget, f,
> + uvc->control_ep, alt))
> return -EINVAL;
>
> usb_ep_enable(uvc->control_ep);
> @@ -341,7 +342,7 @@ uvc_function_set_alt(struct usb_function *f, unsigned interface, unsigned alt)
> usb_ep_disable(uvc->video.ep);
>
> ret = config_ep_by_speed(f->config->cdev->gadget,
> - &(uvc->func), uvc->video.ep);
> + &uvc->func, uvc->video.ep, alt);
> if (ret)
> return ret;
> usb_ep_enable(uvc->video.ep);
> diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c
> index 56906d15fb55..37a0817707d7 100644
> --- a/drivers/usb/gadget/function/u_audio.c
> +++ b/drivers/usb/gadget/function/u_audio.c
> @@ -375,7 +375,7 @@ int u_audio_start_capture(struct g_audio *audio_dev)
>
> ep = audio_dev->out_ep;
> prm = &uac->c_prm;
> - config_ep_by_speed(gadget, &audio_dev->func, ep);
> + config_ep_by_speed(gadget, &audio_dev->func, ep, 0);
> req_len = prm->max_psize;
>
> prm->ep_enabled = true;
> @@ -428,7 +428,7 @@ int u_audio_start_playback(struct g_audio *audio_dev)
>
> ep = audio_dev->in_ep;
> prm = &uac->p_prm;
> - config_ep_by_speed(gadget, &audio_dev->func, ep);
> + config_ep_by_speed(gadget, &audio_dev->func, ep, 0);
>
> ep_desc = ep->desc;
>
> diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
> index 8675e145ea8b..f2374a9c5a12 100644
> --- a/include/linux/usb/composite.h
> +++ b/include/linux/usb/composite.h
> @@ -250,7 +250,7 @@ int usb_function_activate(struct usb_function *);
> int usb_interface_id(struct usb_configuration *, struct usb_function *);
>
> int config_ep_by_speed(struct usb_gadget *g, struct usb_function *f,
> - struct usb_ep *_ep);
> + struct usb_ep *_ep, unsigned alt);
>
> #define MAX_CONFIG_INTERFACES 16 /* arbitrary; max 255 */
>
> --
> 2.20.1
>

--

Thanks,
Peter Chen

Next message: Alexandru Ardelean: "[PATCH] NFC: NCI: use new `delay` structure for SPI transfer delays"
Previous message: Johan Hovold: "Re: [PATCH v4 2/2] usb: overridable hub bInterval by device node"
In reply to: Jayshri Pawar: "[RFC PATCH] usb:gadget: Fixed issue with config_ep_by_speed function."
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]