Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-22 12:54:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge tag 'u-boot-dfu-20231124' of https://source.denx.de/u-boot/custodians/u-boot-dfu

Browse source 
u-boot-dfu-20231124

- Fix reinit for ChipIdea controller
- Add missing newline in fastboot error handling
This commit is contained in:
Tom Rini 2023-11-25 17:38:43 -05:00
commit 1fcf078f54
2 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
drivers/usb/gadget/ci_udc.c
View file

@ -13,6 +13,7 @@
#include <cpu_func.h> #include <cpu_func.h>
#include <net.h> #include <net.h>
#include <malloc.h> #include <malloc.h>
#include <wait_bit.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <linux/delay.h> #include <linux/delay.h>
@ -354,12 +355,49 @@ static int ci_ep_enable(struct usb_ep *ep,
return 0; return 0;
} }
static int ep_disable(int num, int in)
{
struct ci_udc *udc = (struct ci_udc *)controller.ctrl->hcor;
unsigned int ep_bit, enable_bit;
int err;
if (in) {
ep_bit = EPT_TX(num);
enable_bit = CTRL_TXE;
} else {
ep_bit = EPT_RX(num);
enable_bit = CTRL_RXE;
}
/* clear primed buffers */
do {
writel(ep_bit, &udc->epflush);
err = wait_for_bit_le32(&udc->epflush, ep_bit, false, 1000, false);
if (err)
return err;
} while (readl(&udc->epstat) & ep_bit);
/* clear enable bit */
clrbits_le32(&udc->epctrl[num], enable_bit);
return 0;
}
static int ci_ep_disable(struct usb_ep *ep) static int ci_ep_disable(struct usb_ep *ep)
{ {
struct ci_ep *ci_ep = container_of(ep, struct ci_ep, ep); struct ci_ep *ci_ep = container_of(ep, struct ci_ep, ep);
int num, in, err;
num = ci_ep->desc->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
in = (ci_ep->desc->bEndpointAddress & USB_DIR_IN) != 0;
err = ep_disable(num, in);
if (err)
return err;
ci_ep->desc = NULL; ci_ep->desc = NULL;
ep->desc = NULL; ep->desc = NULL;
ci_ep->req_primed = false;
return 0; return 0;
} }

2
drivers/usb/gadget/f_fastboot.c
View file

@ -520,7 +520,7 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req)
cmdbuf[req->actual] = '\0'; cmdbuf[req->actual] = '\0';
cmd = fastboot_handle_command(cmdbuf, response); cmd = fastboot_handle_command(cmdbuf, response);
} else { } else {
pr_err("buffer overflow"); pr_err("buffer overflow\n");
fastboot_fail("buffer overflow", response); fastboot_fail("buffer overflow", response);
} }