Skip to content

dcd/musb: fix ZLP IN transfer #3462

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

Open
HiFiPhile wants to merge 2 commits into
base: master
Choose a base branch
from
+10 −14
Open

dcd/musb: fix ZLP IN transfer #3462

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b03a877
dcd/musb: fix unaligned cast
HiFiPhile Jan 15, 2026
8ef8ee1
dcd/musb: fix zlp IN
HiFiPhile Jan 15, 2026
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
24 changes: 10 additions & 14 deletions src/portable/mentor/musb/dcd_musb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,6 @@
#define MUSB_DEBUG 2
#define MUSB_REGS(rhport) ((musb_regs_t*) MUSB_BASES[rhport])

#if __GNUC__ > 8 && defined(__ARM_FEATURE_UNALIGNED)
/* GCC warns that an address may be unaligned, even though
* the target CPU has the capability for unaligned memory access. */
_Pragma("GCC diagnostic ignored \"-Waddress-of-packed-member\"");
#endif

#include "musb_type.h"
#include "device/dcd.h"

Expand Down Expand Up @@ -73,7 +67,10 @@ typedef struct TU_ATTR_PACKED

typedef struct
{
tusb_control_request_t setup_packet;
union {
tusb_control_request_t setup_packet;
uint32_t setup_buffer[2];
};
uint16_t remaining_ctrl; /* The number of bytes remaining in data stage of control transfer. */
int8_t status_out;
pipe_state_t pipe0;
Expand Down Expand Up @@ -174,9 +171,8 @@ static void process_setup_packet(uint8_t rhport) {
musb_regs_t* musb_regs = MUSB_REGS(rhport);

// Read setup packet
uint32_t *p = (void*)&_dcd.setup_packet;
p[0] = musb_regs->fifo[0];
p[1] = musb_regs->fifo[0];
_dcd.setup_buffer[0] = musb_regs->fifo[0];
_dcd.setup_buffer[1] = musb_regs->fifo[0];

_dcd.pipe0.buf = NULL;
_dcd.pipe0.length = 0;
Expand All @@ -193,14 +189,14 @@ static void process_setup_packet(uint8_t rhport) {
}
}

static bool handle_xfer_in(uint8_t rhport, uint_fast8_t ep_addr)
static bool handle_xfer_in(uint8_t rhport, uint_fast8_t ep_addr, bool is_zlp)
{
unsigned epnum = tu_edpt_number(ep_addr);
unsigned epnum_minus1 = epnum - 1;
pipe_state_t *pipe = &_dcd.pipe[tu_edpt_dir(ep_addr)][epnum_minus1];
const unsigned rem = pipe->remaining;

if (!rem) {
if (!rem && !is_zlp) {
pipe->buf = NULL;
return true;
}
Expand Down Expand Up @@ -272,7 +268,7 @@ static bool edpt_n_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t *buffer, uint16
pipe->remaining = total_bytes;

if (dir_in) {
handle_xfer_in(rhport, ep_addr);
handle_xfer_in(rhport, ep_addr, total_bytes == 0);
} else {
musb_regs_t* musb_regs = MUSB_REGS(rhport);
musb_ep_csr_t* ep_csr = get_ep_csr(musb_regs, epnum);
Expand Down Expand Up @@ -449,7 +445,7 @@ static void process_edpt_n(uint8_t rhport, uint_fast8_t ep_addr)
ep_csr->tx_csrl &= ~(MUSB_TXCSRL1_STALLED | MUSB_TXCSRL1_UNDRN);
return;
}
completed = handle_xfer_in(rhport, ep_addr);
completed = handle_xfer_in(rhport, ep_addr, false);
} else {
// TU_LOG1(" RX CSRL%d = %x\r\n", epn, ep_csr->rx_csrl);
if (ep_csr->rx_csrl & MUSB_RXCSRL1_STALLED) {
Expand Down