colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: dwc3: invalidate dcache on buffer used in interrupt handling

Browse Source 
On Qualcomm systems, the setup buffer and even buffers are in
a bad state at interrupt handling, so invalidate the dcache lines
for the setup_buf and event buffer to make sure we read correct
data written by the hardware.

This fixes the following error:
dwc3-generic-peripheral usb@a600000: UNKNOWN IRQ type -1
dwc3-generic-peripheral usb@a600000: UNKNOWN IRQ type 4673109

and invalid situation in dwc3_gadget_giveback() because setup_buf content
is read at 0s and leads to fatal crash fixed by [1].

[1] https://lore.kernel.org/all/20240528-topic-sm8x50-dwc3-gadget-crash-fix-v1-1-58434ab4b3d3@linaro.org/

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Marek Vasut <marex@denx.de>
Link: https://lore.kernel.org/r/20241011-u-boot-dwc3-gadget-dcache-fixup-v4-3-5f3498d8035b@linaro.org
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
This commit is contained in:
Neil Armstrong
2024-10-11 16:38:26 +02:00
committed by Mattijs Korpershoek
parent 502a50ab1f
commit 3e47302dd7
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/dwc3/ep0.c
View File

@@ -742,6 +742,8 @@ static void dwc3_ep0_inspect_setup(struct dwc3 *dwc,
if (!dwc->gadget_driver) if (!dwc->gadget_driver)
goto out; goto out;
dwc3_invalidate_cache((uintptr_t)ctrl, sizeof(*ctrl));
len = le16_to_cpu(ctrl->wLength); len = le16_to_cpu(ctrl->wLength);
if (!len) { if (!len) {
dwc->three_stage_setup = false; dwc->three_stage_setup = false;

2
drivers/usb/dwc3/gadget.c
View File

@@ -2534,6 +2534,8 @@ static irqreturn_t dwc3_process_event_buf(struct dwc3 *dwc, u32 buf)
while (left > 0) { while (left > 0) {
union dwc3_event event; union dwc3_event event;
dwc3_invalidate_cache((uintptr_t)evt->buf, evt->length);
event.raw = *(u32 *) (evt->buf + evt->lpos); event.raw = *(u32 *) (evt->buf + evt->lpos);
dwc3_process_event_entry(dwc, &event); dwc3_process_event_entry(dwc, &event);

8
drivers/usb/dwc3/io.h
View File

@@ -55,4 +55,12 @@ static inline void dwc3_flush_cache(uintptr_t addr, int length)
flush_dcache_range((unsigned long)start_addr, (unsigned long)end_addr); flush_dcache_range((unsigned long)start_addr, (unsigned long)end_addr);
} }
static inline void dwc3_invalidate_cache(uintptr_t addr, int length)
{
uintptr_t start_addr = (uintptr_t)addr & ~(CACHELINE_SIZE - 1);
uintptr_t end_addr = ALIGN((uintptr_t)addr + length, CACHELINE_SIZE);
invalidate_dcache_range((unsigned long)start_addr, (unsigned long)end_addr);
}
#endif /* __DRIVERS_USB_DWC3_IO_H */ #endif /* __DRIVERS_USB_DWC3_IO_H */