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

Jump to bottom

Add critsec to rp2040 xfer, check endpoint status #2474

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

Add critsec to rp2040 xfer, check endpoint status #2474

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/portable/raspberrypi/rp2040/dcd_rp2040.c
View file
Open in desktop
Expand Up @@ -90,10 +90,12 @@ static void _hw_endpoint_alloc(struct hw_endpoint* ep, uint8_t transfer_type) {
*ep->endpoint_control = reg;
}

static void _hw_endpoint_close(struct hw_endpoint* ep) {
static void _hw_endpoint_close(struct hw_endpoint *ep) {
// Clear hardware registers and then zero the struct
// Clears endpoint enable
*ep->endpoint_control = 0;
if (ep->endpoint_control) {
*ep->endpoint_control = 0;
}
// Clears buffer available, etc
*ep->buffer_control = 0;
// Clear any endpoint state
Expand Down Expand Up @@ -160,6 +162,7 @@ static void hw_endpoint_init(uint8_t ep_addr, uint16_t wMaxPacketSize, uint8_t t
// alloc a buffer and fill in endpoint control register
_hw_endpoint_alloc(ep, transfer_type);
}
ep->configured = true;
}

static void hw_endpoint_xfer(uint8_t ep_addr, uint8_t* buffer, uint16_t total_bytes) {
Expand Down
19 changes: 14 additions & 5 deletions src/portable/raspberrypi/rp2040/rp2040_usb.c
View file
Open in desktop
Expand Up @@ -160,8 +160,8 @@ static uint32_t __tusb_irq_path_func(prepare_ep_buffer)(struct hw_endpoint* ep,
}

// Prepare buffer control register value
void __tusb_irq_path_func(hw_endpoint_start_next_buffer)(struct hw_endpoint* ep) {
uint32_t ep_ctrl = *ep->endpoint_control;
void __tusb_irq_path_func(hw_endpoint_start_next_buffer)(struct hw_endpoint *ep) {
uint32_t ep_ctrl = ep->endpoint_control ? *ep->endpoint_control : 0;

// always compute and start with buffer 0
uint32_t buf_ctrl = prepare_ep_buffer(ep, 0) | USB_BUF_CTRL_SEL;
Expand Down Expand Up @@ -190,7 +190,11 @@ void __tusb_irq_path_func(hw_endpoint_start_next_buffer)(struct hw_endpoint* ep)
ep_ctrl |= EP_CTRL_INTERRUPT_PER_BUFFER;
}

*ep->endpoint_control = ep_ctrl;
uint8_t epnum = tu_edpt_number(ep->ep_addr);
if (epnum != 0) // There's no endpoint control for endpoint 0
{
*ep->endpoint_control = ep_ctrl;
}

TU_LOG(3, " Prepare BufCtrl: [0] = 0x%04x [1] = 0x%04x\r\n", tu_u32_low16(buf_ctrl), tu_u32_high16(buf_ctrl));

Expand All @@ -202,7 +206,12 @@ void __tusb_irq_path_func(hw_endpoint_start_next_buffer)(struct hw_endpoint* ep)
void hw_endpoint_xfer_start(struct hw_endpoint* ep, uint8_t* buffer, uint16_t total_len) {
hw_endpoint_lock_update(ep, 1);

if (ep->active) {
// We need to make sure the ep didn't get cleared from under us by an IRQ
if ( !ep->configured ) {
return;
}

if ( ep->active ) {
// TODO: Is this acceptable for interrupt packets?
TU_LOG(1, "WARN: starting new transfer on already active ep %d %s\r\n", tu_edpt_number(ep->ep_addr),
ep_dir_string[tu_edpt_dir(ep->ep_addr)]);
Expand Down Expand Up @@ -273,7 +282,7 @@ static void __tusb_irq_path_func(_hw_endpoint_xfer_sync)(struct hw_endpoint* ep)
uint16_t buf0_bytes = sync_ep_buffer(ep, 0);

// sync buffer 1 if double buffered
if ((*ep->endpoint_control) & EP_CTRL_DOUBLE_BUFFERED_BITS) {
if ( ep->endpoint_control && ((*ep->endpoint_control) & EP_CTRL_DOUBLE_BUFFERED_BITS) ) {
if (buf0_bytes == ep->wMaxPacketSize) {
// sync buffer 1 if not short packet
sync_ep_buffer(ep, 1);
Expand Down
19 changes: 15 additions & 4 deletions src/portable/raspberrypi/rp2040/rp2040_usb.h
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@
#include "common/tusb_common.h"

#include "pico.h"
#include "pico/critical_section.h"
#include "hardware/structs/usb.h"
#include "hardware/irq.h"
#include "hardware/resets.h"
Expand Down Expand Up @@ -104,10 +105,20 @@ bool hw_endpoint_xfer_continue(struct hw_endpoint *ep);
void hw_endpoint_reset_transfer(struct hw_endpoint *ep);
void hw_endpoint_start_next_buffer(struct hw_endpoint *ep);

TU_ATTR_ALWAYS_INLINE static inline void hw_endpoint_lock_update(__unused struct hw_endpoint * ep, __unused int delta) {
// todo add critsec as necessary to prevent issues between worker and IRQ...
// note that this is perhaps as simple as disabling IRQs because it would make
// sense to have worker and IRQ on same core, however I think using critsec is about equivalent.
TU_ATTR_ALWAYS_INLINE static inline void hw_endpoint_lock_update(__unused struct hw_endpoint * ep, int delta) {
static critical_section_t hw_endpoint_crit_sec;
static int hw_endpoint_crit_sec_ref = 0;
if ( !critical_section_is_initialized(&hw_endpoint_crit_sec) ) {
critical_section_init(&hw_endpoint_crit_sec);
}

if ( delta > 0 && !hw_endpoint_crit_sec_ref ) {
critical_section_enter_blocking(&hw_endpoint_crit_sec);
}
hw_endpoint_crit_sec_ref += delta;
if ( hw_endpoint_crit_sec_ref == 0 ) {
critical_section_exit(&hw_endpoint_crit_sec);
}
}

void _hw_endpoint_buffer_control_update32(struct hw_endpoint *ep, uint32_t and_mask, uint32_t or_mask);
Expand Down