Skip to content

firmware: fix race conditions in control out transfers (-3 bytes XRAM). #703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
whitequark merged 1 commit into from
Oct 8, 2025
Merged

firmware: fix race conditions in control out transfers (-3 bytes XRAM). #703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 24 additions & 20 deletions firmware/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ bool handle_usb_set_interface(uint8_t interface, uint8_t alt_setting) {

void handle_usb_get_interface(uint8_t interface) {
EP0BUF[0] = usb_alt_setting[interface];
SETUP_EP0_BUF(1);
SETUP_EP0_IN_BUF(1);
}

// This monotonically increasing number ensures that we upload bitstream chunks
Expand Down Expand Up @@ -479,9 +479,9 @@ void handle_pending_usb_setup() {
if(!eeprom_read(arg_chip, arg_addr, EP0BUF, chunk_len, /*double_byte=*/true)) {
goto stall_ep0_return;
}
SETUP_EP0_BUF(chunk_len);
SETUP_EP0_IN_BUF(chunk_len);
} else {
SETUP_EP0_BUF(0);
SETUP_EP0_OUT_BUF();
while(EP0CS & _BUSY);
// Using a constant page size of 64 bytes because both the ICE and FX2 EEPROMs have a page
// size of >= 64 bytes, and USB2 control transfer packets are at most 64 bytes.
Expand All @@ -490,6 +490,7 @@ void handle_pending_usb_setup() {
page_size, timeout)) {
goto stall_ep0_return;
}
ACK_EP0();
}

arg_len -= chunk_len;
Expand All @@ -509,13 +510,14 @@ void handle_pending_usb_setup() {
if(req_dir_in) {
while(EP0CS & _BUSY);
if(fpga_reg_read(EP0BUF, arg_len)) {
SETUP_EP0_BUF(arg_len);
SETUP_EP0_IN_BUF(arg_len);
return;
}
} else {
SETUP_EP0_BUF(0);
SETUP_EP0_OUT_BUF();
while(EP0CS & _BUSY);
fpga_reg_write(EP0BUF, arg_len);
ACK_EP0();
return;
}
}
Expand All @@ -532,7 +534,7 @@ void handle_pending_usb_setup() {
while(EP0CS & _BUSY);
EP0BUF[0] = status |
(fpga_is_ready() ? ST_FPGA_RDY : 0);
SETUP_EP0_BUF(1);
SETUP_EP0_IN_BUF(1);

reset_status_bit(ST_ERROR);

Expand All @@ -555,12 +557,13 @@ void handle_pending_usb_setup() {
while(arg_len > 0) {
uint8_t chunk_len = arg_len < 64 ? arg_len : 64;

SETUP_EP0_BUF(0);
SETUP_EP0_OUT_BUF();
while(EP0CS & _BUSY);
fpga_load(EP0BUF, chunk_len);

arg_len -= chunk_len;
}
ACK_EP0();

bitstream_idx = arg_idx;
return;
Expand All @@ -574,12 +577,13 @@ void handle_pending_usb_setup() {
if(req_dir_in) {
while(EP0CS & _BUSY);
xmemcpy(EP0BUF, glasgow_config.bitstream_id, CONFIG_SIZE_BITSTREAM_ID);
SETUP_EP0_BUF(CONFIG_SIZE_BITSTREAM_ID);
SETUP_EP0_IN_BUF(CONFIG_SIZE_BITSTREAM_ID);
} else {
if(fpga_start()) {
SETUP_EP0_BUF(0);
SETUP_EP0_OUT_BUF();
while(EP0CS & _BUSY);
xmemcpy(glasgow_config.bitstream_id, EP0BUF, CONFIG_SIZE_BITSTREAM_ID);
ACK_EP0();
} else {
goto stall_ep0_return;
}
Expand All @@ -599,10 +603,10 @@ void handle_pending_usb_setup() {
if(!iobuf_get_voltage(arg_mask, (__xdata uint16_t *)EP0BUF)) {
goto stall_ep0_return;
} else {
SETUP_EP0_BUF(2);
SETUP_EP0_IN_BUF(2);
}
} else {
SETUP_EP0_BUF(2);
SETUP_EP0_IN_BUF(2);
while(EP0CS & _BUSY);
if(!iobuf_set_voltage(arg_mask, (__xdata uint16_t *)EP0BUF)) {
latch_status_bit(ST_ERROR);
Expand Down Expand Up @@ -630,7 +634,7 @@ void handle_pending_usb_setup() {
if(!result) {
goto stall_ep0_return;
} else {
SETUP_EP0_BUF(2);
SETUP_EP0_IN_BUF(2);
}

return;
Expand All @@ -654,10 +658,10 @@ void handle_pending_usb_setup() {
if(!result) {
goto stall_ep0_return;
} else {
SETUP_EP0_BUF(4);
SETUP_EP0_IN_BUF(4);
}
} else {
SETUP_EP0_BUF(4);
SETUP_EP0_IN_BUF(4);
while(EP0CS & _BUSY);

if(glasgow_config.revision >= GLASGOW_REV_C2)
Expand Down Expand Up @@ -691,7 +695,7 @@ void handle_pending_usb_setup() {
if(!result) {
goto stall_ep0_return;
} else {
SETUP_EP0_BUF(1);
SETUP_EP0_IN_BUF(1);
// Clear the ERR led since we cleared the alert status above
reset_status_bit(ST_ALERT);
}
Expand Down Expand Up @@ -723,10 +727,10 @@ void handle_pending_usb_setup() {
if(!iobuf_get_voltage_limit(arg_mask, (__xdata uint16_t *)EP0BUF)) {
goto stall_ep0_return;
} else {
SETUP_EP0_BUF(2);
SETUP_EP0_IN_BUF(2);
}
} else {
SETUP_EP0_BUF(2);
SETUP_EP0_IN_BUF(2);
while(EP0CS & _BUSY);
if(!iobuf_set_voltage_limit(arg_mask, (__xdata uint16_t *)EP0BUF)) {
latch_status_bit(ST_ERROR);
Expand Down Expand Up @@ -758,10 +762,10 @@ void handle_pending_usb_setup() {
(__xdata uint8_t *)EP0BUF + 1)) {
goto stall_ep0_return;
} else {
SETUP_EP0_BUF(2);
SETUP_EP0_IN_BUF(2);
}
} else {
SETUP_EP0_BUF(2);
SETUP_EP0_IN_BUF(2);
while(EP0CS & _BUSY);
if(glasgow_config.revision < GLASGOW_REV_C0 ||
!iobuf_set_pull(arg_selector,
Expand Down Expand Up @@ -798,7 +802,7 @@ void handle_pending_usb_setup() {

while(EP0CS & _BUSY);
EP0BUF[0] = CUR_API_LEVEL;
SETUP_EP0_BUF(1);
SETUP_EP0_IN_BUF(1);
return;
}

Expand Down
2 changes: 1 addition & 1 deletion vendor/libfx2
Open in desktop
Submodule libfx2 updated from 013416 to 00f7d8
Loading