Skip to content
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

mentor/dcd_musb - Fix issue reading and writing to USBFIFOn register #3017

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

mentor/dcd_musb - Fix issue reading and writing to USBFIFOn register #3017

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
103 changes: 74 additions & 29 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 @@ -170,50 +170,91 @@ TU_ATTR_ALWAYS_INLINE static inline void hwfifo_flush(musb_regs_t* musb, unsigne
}
}

static void pipe_write_packet(void *buf, volatile void *fifo, unsigned len)
static void pipe_write_packet(void *buf, volatile void *fifo, unsigned len, uint8_t op)
{
volatile hw_fifo_t *reg = (volatile hw_fifo_t*)fifo;
uintptr_t addr = (uintptr_t)buf;
while (len >= 4) {
reg->u32 = *(uint32_t const *)addr;
addr += 4;
len -= 4;

if(op == 4) {
while (len >= 4) {
reg->u32 = *(uint32_t const *)addr;
addr += 4;
len -= 4;
}
}
if (len >= 2) {
reg->u16 = *(uint16_t const *)addr;
addr += 2;
len -= 2;

if(op == 2) {
while (len >= 2) {
reg->u16 = *(uint16_t const *)addr;
addr += 2;
len -= 2;
}
}
if (len) {
reg->u8 = *(uint8_t const *)addr;

if(op == 1) {
while (len) {
reg->u8 = *(uint8_t const *)addr;
addr += 1;
len -= 1;
}
}
}

static void pipe_read_packet(void *buf, volatile void *fifo, unsigned len)
static void pipe_read_packet(void *buf, volatile void *fifo, unsigned len, uint8_t op)
{
volatile hw_fifo_t *reg = (volatile hw_fifo_t*)fifo;
uintptr_t addr = (uintptr_t)buf;
while (len >= 4) {
*(uint32_t *)addr = reg->u32;
addr += 4;
len -= 4;

if(op == 4) {
while (len >= 4) {
*(uint32_t *)addr = reg->u32;
addr += 4;
len -= 4;
}
}
if (len >= 2) {
*(uint16_t *)addr = reg->u16;
addr += 2;
len -= 2;

if(op == 2) {
while (len >= 2) {
*(uint16_t *)addr = reg->u16;
addr += 2;
len -= 2;
}
}
if (len) {
*(uint8_t *)addr = reg->u8;

if(op == 1) {
while (len) {
*(uint8_t *)addr = reg->u8;
addr += 1;
len -= 1;
}
}

}

/**
* @brief Determine which #-bit operation can be used to send/receive all
* the data.
*
* @param len Number of bytes that will be read/written
*
* @return 4 (32-bit), 2(16-bit) or 1(8-bit)
*
*/
static uint8_t fifo_access_size(unsigned len) {
/* Check if only 32-bit operations can be used */
if ((len & 3) == 0 ) return 4;
/* Check if only 16-bit operations can be used */
if ((len & 1) == 0 ) return 2;
/* Only use 8-bit operations */
return 1;
}

static void pipe_read_write_packet_ff(tu_fifo_t *f, volatile void *fifo, unsigned len, unsigned dir)
{
static const struct {
void (*tu_fifo_get_info)(tu_fifo_t *f, tu_fifo_buffer_info_t *info);
void (*tu_fifo_advance)(tu_fifo_t *f, uint16_t n);
void (*pipe_read_write)(void *buf, volatile void *fifo, unsigned len);
void (*pipe_read_write)(void *buf, volatile void *fifo, unsigned len,uint8_t op);
} ops[] = {
/* OUT */ {tu_fifo_get_write_info,tu_fifo_advance_write_pointer,pipe_read_packet},
/* IN */ {tu_fifo_get_read_info, tu_fifo_advance_read_pointer, pipe_write_packet},
Expand All @@ -222,11 +263,15 @@ static void pipe_read_write_packet_ff(tu_fifo_t *f, volatile void *fifo, unsigne
ops[dir].tu_fifo_get_info(f, &info);
unsigned total_len = len;
len = TU_MIN(total_len, info.len_lin);
ops[dir].pipe_read_write(info.ptr_lin, fifo, len);
unsigned rem = total_len - len;

/* Determine the min # bit operation that can be used for the packet */
uint8_t op = TU_MIN(fifo_access_size(len),fifo_access_size(rem));
ops[dir].pipe_read_write(info.ptr_lin, fifo, len,op);

if (rem) {
len = TU_MIN(rem, info.len_wrap);
ops[dir].pipe_read_write(info.ptr_wrap, fifo, len);
ops[dir].pipe_read_write(info.ptr_wrap, fifo, len,op);
rem -= len;
}
ops[dir].tu_fifo_advance(f, total_len - rem);
Expand Down Expand Up @@ -279,7 +324,7 @@ static bool handle_xfer_in(uint8_t rhport, uint_fast8_t ep_addr)
if (_dcd.pipe_buf_is_fifo[TUSB_DIR_IN] & TU_BIT(epnum_minus1)) {
pipe_read_write_packet_ff(buf, fifo_ptr, len, TUSB_DIR_IN);
} else {
pipe_write_packet(buf, fifo_ptr, len);
pipe_write_packet(buf, fifo_ptr, len , fifo_access_size(len));
pipe->buf = buf + len;
}
pipe->remaining = rem - len;
Expand Down Expand Up @@ -310,7 +355,7 @@ static bool handle_xfer_out(uint8_t rhport, uint_fast8_t ep_addr)
if (_dcd.pipe_buf_is_fifo[TUSB_DIR_OUT] & TU_BIT(epnum_minus1)) {
pipe_read_write_packet_ff(buf, fifo_ptr, len, TUSB_DIR_OUT);
} else {
pipe_read_packet(buf, fifo_ptr, len);
pipe_read_packet(buf, fifo_ptr, len, fifo_access_size(len));
pipe->buf = buf + len;
}
pipe->remaining = rem - len;
Expand Down Expand Up @@ -378,7 +423,7 @@ static bool edpt0_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t *buffer, uint16_
const unsigned len = TU_MIN(TU_MIN(rem, 64), total_bytes);
volatile void *fifo_ptr = &musb_regs->fifo[0];
if (dir_in) {
pipe_write_packet(buffer, fifo_ptr, len);
pipe_write_packet(buffer, fifo_ptr, len, fifo_access_size(len));

_dcd.pipe0.buf = buffer + len;
_dcd.pipe0.length = len;
Expand Down Expand Up @@ -458,7 +503,7 @@ static void process_ep0(uint8_t rhport)
const unsigned rem = _dcd.pipe0.remaining;
const unsigned len = TU_MIN(TU_MIN(rem, 64), vld);
volatile void *fifo_ptr = &musb_regs->fifo[0];
pipe_read_packet(_dcd.pipe0.buf, fifo_ptr, len);
pipe_read_packet(_dcd.pipe0.buf, fifo_ptr, len, fifo_access_size(len));

_dcd.pipe0.remaining = rem - len;
_dcd.remaining_ctrl -= len;
Expand Down
Loading