redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

MLK-17631-2 usb: cdns3: gadget: fix the bug the non-ep0 can't work after disconnection 

We add endpoints to ep_match_list when adding gadget module, but
we delete the endpoints from the ep_match_list before set configuration.
When the re-enumeration after the new connection, the ep_match_list
is empty, in that case, the non-ep0s have not configurated, the
transfer on them will be failed.

In this commit, we only delete the endpoints from the list when we
remove the gadget module.

Acked-by: Jun Li <jun.li@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
pull/10/head
Peter Chen 2018-03-06 15:21:01 +08:00 committed by Jason Liu
parent 42a115ca20
commit 997ccf4804
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/usb/cdns3/gadget.c
View File

@ -755,10 +755,8 @@ static int cdns_req_ep0_set_configuration(struct usb_ss_dev *usb_ss,
case USB_STATE_ADDRESS:
/* Configure non-control EPs */
list_for_each_entry_safe(usb_ss_ep, temp_ss_ep,
&usb_ss->ep_match_list, ep_match_pending_list) {
&usb_ss->ep_match_list, ep_match_pending_list)
cdns_ep_config(usb_ss_ep);
list_del(&usb_ss_ep->ep_match_pending_list);
}
#ifdef CDNS_THREADED_IRQ_HANDLING
usb_ss->ep_ien = gadget_readl(usb_ss, &usb_ss->regs->ep_ien)
@ -1980,18 +1978,24 @@ static int usb_ss_gadget_udc_stop(struct usb_gadget *gadget)
{
struct usb_ss_dev *usb_ss = gadget_to_usb_ss(gadget);
struct usb_ep *ep;
struct usb_ss_endpoint *usb_ss_ep;
struct usb_ss_endpoint *usb_ss_ep, *temp_ss_ep;
int i;
u32 bEndpointAddress;
usb_ss->gadget_driver = NULL;
list_for_each_entry_safe(usb_ss_ep, temp_ss_ep,
&usb_ss->ep_match_list, ep_match_pending_list) {
list_del(&usb_ss_ep->ep_match_pending_list);
usb_ss_ep->used = false;
}
if (!usb_ss->start_gadget)
return 0;
list_for_each_entry(ep, &usb_ss->gadget.ep_list, ep_list) {
usb_ss_ep = to_usb_ss_ep(ep);
bEndpointAddress = usb_ss_ep->num | usb_ss_ep->dir;
usb_ss_ep->used = false;
select_ep(usb_ss, bEndpointAddress);
gadget_writel(usb_ss, &usb_ss->regs->ep_cmd,
EP_CMD__EPRST__MASK);