len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2026-10-10 08:03:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb arc: flush both EP0 directions when SETUP replaces a transfer

Browse source 
The USB core can accept a replacement SETUP while the previous control transfer is unfinished. Before dispatching that SETUP, flush both EP0 directions and discard their old completion bits so old descriptors cannot be reported as the new transfer. Leave non-control endpoints alone.

The register-stub test verifies both flushes, EP0 completion clearing and release of old EP0 waiters. This complements the separate generic control-request state-machine fix.

Change-Id: If595c7c0cfade7d855f113587621847926143606
This commit is contained in:
Paul Sauro 2026-09-20 17:21:42 +02:00
parent 9101f35519
commit d1fab121f8
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
firmware/target/arm/usb-drv-arc.c
View file

@ -362,7 +362,7 @@ static const unsigned int pipe2mask[USB_NUM_ENDPOINTS*2] = {
/*-------------------------------------------------------------------------*/
static void transfer_completed(void);
static void control_received(void);
static void setup_received(void);
static void sof_received(void);
static int prime_transfer(int ep_num, void* ptr, int len, bool send, bool wait);
static void prepare_td(struct transfer_descriptor* td,
@ -575,7 +575,7 @@ void usb_drv_int(void)
/* a control packet? */
if (REG_ENDPTSETUPSTAT & EPSETUP_STATUS_EP0) {
control_received();
setup_received();
}
if (REG_ENDPTCOMPLETE)
@ -1070,7 +1070,7 @@ static void prepare_td(struct transfer_descriptor* td,
}
}
static void control_received(void)
static void setup_received(void)
{
int i;
/* copy setup data from packet */
@ -1081,6 +1081,13 @@ static void control_received(void)
/* acknowledge packet recieved */
REG_ENDPTSETUPSTAT = EPSETUP_STATUS_EP0;
/* A new SETUP cancels both halves of the old control transfer. Flush
* only EP0: cancelling storage/HID here would lose unrelated traffic.
* Discard its completion bits before the core primes the new request. */
usb_drv_reset_endpoint(EP_CONTROL, false);
usb_drv_reset_endpoint(EP_CONTROL, true);
REG_ENDPTCOMPLETE = pipe2mask[0] | pipe2mask[1];
/* Stop pending control transfers */
for(i=0;i<2;i++) {
if(qh_array[i].wait) {