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

usb: dwc3: allocate setup_buf with dma_alloc_coherent()

Browse source 
Since setup_buf is also consumed by hardware DMA, aligns it's
allocation like other hardware buffers by introduce setup_buf_addr
populated by dma_alloc_coherent(), and use it to pass the physical
address of the buffer to the hardware.

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20241011-u-boot-dwc3-gadget-dcache-fixup-v4-1-5f3498d8035b@linaro.org
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
This commit is contained in:
Neil Armstrong 2024-10-11 16:38:24 +02:00 • committed by Mattijs Korpershoek
parent c54c72dec7
commit 1f12fc7e33
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/usb/dwc3/core.h
View file

@ -670,6 +670,7 @@ struct dwc3_scratchpad_array {
* @ep0_trb: dma address of ep0_trb * @ep0_trb: dma address of ep0_trb
* @ep0_usb_req: dummy req used while handling STD USB requests * @ep0_usb_req: dummy req used while handling STD USB requests
* @ep0_bounce_addr: dma address of ep0_bounce * @ep0_bounce_addr: dma address of ep0_bounce
* @setup_buf_addr: dma address of setup_buf
* @scratch_addr: dma address of scratchbuf * @scratch_addr: dma address of scratchbuf
* @lock: for synchronizing * @lock: for synchronizing
* @dev: pointer to our struct device * @dev: pointer to our struct device
@ -757,6 +758,7 @@ struct dwc3 {
dma_addr_t ep0_trb_addr; dma_addr_t ep0_trb_addr;
dma_addr_t ep0_bounce_addr; dma_addr_t ep0_bounce_addr;
dma_addr_t scratch_addr; dma_addr_t scratch_addr;
dma_addr_t setup_buf_addr;
struct dwc3_request ep0_usb_req; struct dwc3_request ep0_usb_req;
/* device lock */ /* device lock */

4
drivers/usb/dwc3/ep0.c
View file

@ -380,7 +380,7 @@ static int dwc3_ep0_handle_status(struct dwc3 *dwc,
dep = dwc->eps[0]; dep = dwc->eps[0];
dwc->ep0_usb_req.dep = dep; dwc->ep0_usb_req.dep = dep;
dwc->ep0_usb_req.request.length = sizeof(*response_pkt); dwc->ep0_usb_req.request.length = sizeof(*response_pkt);
dwc->ep0_usb_req.request.buf = dwc->setup_buf; dwc->ep0_usb_req.request.buf = (void *)dwc->setup_buf_addr;
dwc->ep0_usb_req.request.complete = dwc3_ep0_status_cmpl; dwc->ep0_usb_req.request.complete = dwc3_ep0_status_cmpl;
return __dwc3_gadget_ep0_queue(dep, &dwc->ep0_usb_req); return __dwc3_gadget_ep0_queue(dep, &dwc->ep0_usb_req);
@ -662,7 +662,7 @@ static int dwc3_ep0_set_sel(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
dep = dwc->eps[0]; dep = dwc->eps[0];
dwc->ep0_usb_req.dep = dep; dwc->ep0_usb_req.dep = dep;
dwc->ep0_usb_req.request.length = dep->endpoint.maxpacket; dwc->ep0_usb_req.request.length = dep->endpoint.maxpacket;
dwc->ep0_usb_req.request.buf = dwc->setup_buf; dwc->ep0_usb_req.request.buf = (void *)dwc->setup_buf_addr;
dwc->ep0_usb_req.request.complete = dwc3_ep0_set_sel_cmpl; dwc->ep0_usb_req.request.complete = dwc3_ep0_set_sel_cmpl;
return __dwc3_gadget_ep0_queue(dep, &dwc->ep0_usb_req); return __dwc3_gadget_ep0_queue(dep, &dwc->ep0_usb_req);

8
drivers/usb/dwc3/gadget.c
View file

@ -2653,8 +2653,8 @@ int dwc3_gadget_init(struct dwc3 *dwc)
goto err1; goto err1;
} }
dwc->setup_buf = memalign(CONFIG_SYS_CACHELINE_SIZE, dwc->setup_buf = dma_alloc_coherent(DWC3_EP0_BOUNCE_SIZE,
DWC3_EP0_BOUNCE_SIZE); (unsigned long *)&dwc->setup_buf_addr);
if (!dwc->setup_buf) { if (!dwc->setup_buf) {
ret = -ENOMEM; ret = -ENOMEM;
goto err2; goto err2;
@ -2701,7 +2701,7 @@ err4:
dma_free_coherent(dwc->ep0_bounce); dma_free_coherent(dwc->ep0_bounce);
err3: err3:
kfree(dwc->setup_buf); dma_free_coherent(dwc->setup_buf);
err2: err2:
dma_free_coherent(dwc->ep0_trb); dma_free_coherent(dwc->ep0_trb);
@ -2723,7 +2723,7 @@ void dwc3_gadget_exit(struct dwc3 *dwc)
dma_free_coherent(dwc->ep0_bounce); dma_free_coherent(dwc->ep0_bounce);
kfree(dwc->setup_buf); dma_free_coherent(dwc->setup_buf);
dma_free_coherent(dwc->ep0_trb); dma_free_coherent(dwc->ep0_trb);