From: Frank Li <Frank.Li@nxp.com>
To: peter.chen@kernel.org, cugyly@163.com
Cc: Frank.Li@nxp.com, a-govindraju@ti.com,
gregkh@linuxfoundation.org, imx@lists.linux.dev,
linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
pawell@cadence.com, rogerq@kernel.org
Subject: [PATCH 4/4] Revert "usb: gadget: f_uvc: change endpoint allocation in uvc_function_bind()"
Date: Thu, 21 Dec 2023 11:54:26 -0500 [thread overview]
Message-ID: <20231221165426.1590866-5-Frank.Li@nxp.com> (raw)
In-Reply-To: <20231221165426.1590866-1-Frank.Li@nxp.com>
This reverts commit 3c5b006f3ee800b4bd9ed37b3a8f271b8560126e.
gadget_is_{super|dual}speed() API check UDC controller capitblity. It
should pass down highest speed endpoint descriptor to UDC controller. So
UDC controller driver can reserve enough resource at check_config(),
especially mult and maxburst. So UDC driver (such as cdns3) can know need
at least (mult + 1) * (maxburst + 1) * wMaxPacketSize internal memory for
this uvc functions.
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
drivers/usb/gadget/function/f_uvc.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
index faa398109431f..cc4e08c8169b4 100644
--- a/drivers/usb/gadget/function/f_uvc.c
+++ b/drivers/usb/gadget/function/f_uvc.c
@@ -719,13 +719,21 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)
}
uvc->enable_interrupt_ep = opts->enable_interrupt_ep;
- ep = usb_ep_autoconfig(cdev->gadget, &uvc_fs_streaming_ep);
+ if (gadget_is_superspeed(c->cdev->gadget))
+ ep = usb_ep_autoconfig_ss(cdev->gadget, &uvc_ss_streaming_ep,
+ &uvc_ss_streaming_comp);
+ else if (gadget_is_dualspeed(cdev->gadget))
+ ep = usb_ep_autoconfig(cdev->gadget, &uvc_hs_streaming_ep);
+ else
+ ep = usb_ep_autoconfig(cdev->gadget, &uvc_fs_streaming_ep);
+
if (!ep) {
uvcg_info(f, "Unable to allocate streaming EP\n");
goto error;
}
uvc->video.ep = ep;
+ uvc_fs_streaming_ep.bEndpointAddress = uvc->video.ep->address;
uvc_hs_streaming_ep.bEndpointAddress = uvc->video.ep->address;
uvc_ss_streaming_ep.bEndpointAddress = uvc->video.ep->address;
--
2.34.1
next prev parent reply other threads:[~2023-12-21 16:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-21 16:54 [PATCH 0/4] usb: cdns3: usb uvc iso transfer fix Frank Li
2023-12-21 16:54 ` [PATCH 1/4] usb: cdns3: fix uvc failure work since sg support enabled Frank Li
2023-12-21 16:54 ` [PATCH 2/4] usb: cdns3: fix iso transfer error when mult is not zero Frank Li
2023-12-21 16:54 ` [PATCH 3/4] usb: cdns3: Fix uvc fail when DMA cross 4k boundery since sg enabled Frank Li
2023-12-21 16:54 ` Frank Li [this message]
2023-12-22 12:26 ` [PATCH 4/4] Revert "usb: gadget: f_uvc: change endpoint allocation in uvc_function_bind()" yuan linyu
2023-12-23 3:42 ` Frank Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231221165426.1590866-5-Frank.Li@nxp.com \
--to=frank.li@nxp.com \
--cc=a-govindraju@ti.com \
--cc=cugyly@163.com \
--cc=gregkh@linuxfoundation.org \
--cc=imx@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=pawell@cadence.com \
--cc=peter.chen@kernel.org \
--cc=rogerq@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®