andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3077 from HiFiPhile/ping_out

Browse Source
This commit is contained in:
Ha Thach
2025-04-19 00:03:51 +07:00
committed by GitHub
parent e44f556a95 d51863d1a0
commit 5572168994
2 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/portable/synopsys/dwc2/dwc2_type.h
View File

@@ -2088,9 +2088,9 @@ TU_VERIFY_STATIC(offsetof(dwc2_regs_t, fifo ) == 0x1000, "incorrect size");
#define HCTSIZ_DOPING_Pos (31U) #define HCTSIZ_DOPING_Pos (31U)
#define HCTSIZ_DOPING_Msk (0x1UL << HCTSIZ_DOPING_Pos) // 0x80000000 #define HCTSIZ_DOPING_Msk (0x1UL << HCTSIZ_DOPING_Pos) // 0x80000000
#define HCTSIZ_DOPING HCTSIZ_DOPING_Msk // Do PING #define HCTSIZ_DOPING HCTSIZ_DOPING_Msk // Do PING
#define HCTSIZ_PID_Pos (29U) #define HCTSIZ_PID_Pos (29U)
#define HCTSIZ_PID_Msk (0x3UL << HCTSIZ_PID_Pos) // 0x60000000 #define HCTSIZ_PID_Msk (0x3UL << HCTSIZ_PID_Pos) // 0x60000000
#define HCTSIZ_PID HCTSIZ_PID_Msk // Data PID #define HCTSIZ_PID HCTSIZ_PID_Msk // Data PID
/******************** Bit definition for DIEPDMA register ********************/ /******************** Bit definition for DIEPDMA register ********************/
#define DIEPDMA_DMAADDR_Pos (0U) #define DIEPDMA_DMAADDR_Pos (0U)

35
src/portable/synopsys/dwc2/hcd_dwc2.c
View File

@@ -75,9 +75,9 @@ typedef struct {
struct TU_ATTR_PACKED { struct TU_ATTR_PACKED {
uint32_t uframe_interval : 18; // micro-frame interval uint32_t uframe_interval : 18; // micro-frame interval
uint32_t speed : 2; uint32_t speed : 2;
uint32_t next_pid : 2; uint32_t next_pid : 2; // PID for next transfer
uint32_t do_ping : 1; uint32_t next_do_ping : 1; // Do PING for next transfer if possible (highspeed OUT)
// uint32_t : 9; // uint32_t : 9;
}; };
@@ -567,12 +567,12 @@ static bool channel_xfer_start(dwc2_regs_t* dwc2, uint8_t ch_id) {
hctsiz.pid = edpt->next_pid; // next PID is set in transfer complete interrupt hctsiz.pid = edpt->next_pid; // next PID is set in transfer complete interrupt
hctsiz.packet_count = packet_count; hctsiz.packet_count = packet_count;
hctsiz.xfer_size = edpt->buflen; hctsiz.xfer_size = edpt->buflen;
if (edpt->do_ping && edpt->speed == TUSB_SPEED_HIGH && if (edpt->next_do_ping && edpt->speed == TUSB_SPEED_HIGH &&
edpt->next_pid != HCTSIZ_PID_SETUP && hcchar_bm->ep_dir == TUSB_DIR_OUT) { edpt->next_pid != HCTSIZ_PID_SETUP && hcchar_bm->ep_dir == TUSB_DIR_OUT) {
hctsiz.do_ping = 1; hctsiz.do_ping = 1;
} }
channel->hctsiz = hctsiz.value; channel->hctsiz = hctsiz.value;
edpt->do_ping = 0; edpt->next_do_ping = 0;
// pre-calculate next PID based on packet count, adjusted in transfer complete interrupt if short packet // pre-calculate next PID based on packet count, adjusted in transfer complete interrupt if short packet
if (hcchar_bm->ep_num == 0) { if (hcchar_bm->ep_num == 0) {
@@ -603,7 +603,7 @@ static bool channel_xfer_start(dwc2_regs_t* dwc2, uint8_t ch_id) {
hcintmsk |= HCINT_BABBLE_ERR | HCINT_DATATOGGLE_ERR | HCINT_ACK; hcintmsk |= HCINT_BABBLE_ERR | HCINT_DATATOGGLE_ERR | HCINT_ACK;
} else { } else {
hcintmsk |= HCINT_NYET; hcintmsk |= HCINT_NYET;
if (edpt->hcsplt_bm.split_en) { if (edpt->hcsplt_bm.split_en || hctsiz.do_ping) {
hcintmsk |= HCINT_ACK; hcintmsk |= HCINT_ACK;
} }
} }
@@ -959,6 +959,10 @@ static bool handle_channel_out_slave(dwc2_regs_t* dwc2, uint8_t ch_id, uint32_t
is_done = true; is_done = true;
xfer->result = XFER_RESULT_SUCCESS; xfer->result = XFER_RESULT_SUCCESS;
channel->hcintmsk &= ~HCINT_ACK; channel->hcintmsk &= ~HCINT_ACK;
if (hcint & HCINT_NYET) {
// complete transfer with NYET, do ping next time
edpt->next_do_ping = 1;
}
} else if (hcint & HCINT_STALL) { } else if (hcint & HCINT_STALL) {
xfer->result = XFER_RESULT_STALLED; xfer->result = XFER_RESULT_STALLED;
channel_disable(dwc2, channel); channel_disable(dwc2, channel);
@@ -970,7 +974,7 @@ static bool handle_channel_out_slave(dwc2_regs_t* dwc2, uint8_t ch_id, uint32_t
channel->hcsplt = hcsplt.value; channel->hcsplt = hcsplt.value;
channel->hcchar |= HCCHAR_CHENA; channel->hcchar |= HCCHAR_CHENA;
} else { } else {
edpt->do_ping = 1; edpt->next_do_ping = 1;
channel_xfer_out_wrapup(dwc2, ch_id); channel_xfer_out_wrapup(dwc2, ch_id);
channel_disable(dwc2, channel); channel_disable(dwc2, channel);
} }
@@ -983,7 +987,7 @@ static bool handle_channel_out_slave(dwc2_regs_t* dwc2, uint8_t ch_id, uint32_t
channel->hcintmsk |= HCINT_ACK; channel->hcintmsk |= HCINT_ACK;
} else { } else {
// NAK disable channel to flush all posted request and try again // NAK disable channel to flush all posted request and try again
edpt->do_ping = 1; edpt->next_do_ping = 1;
xfer->err_count = 0; xfer->err_count = 0;
} }
} else if (hcint & HCINT_HALTED) { } else if (hcint & HCINT_HALTED) {
@@ -1000,10 +1004,17 @@ static bool handle_channel_out_slave(dwc2_regs_t* dwc2, uint8_t ch_id, uint32_t
} else if (hcint & HCINT_ACK) { } else if (hcint & HCINT_ACK) {
xfer->err_count = 0; xfer->err_count = 0;
channel->hcintmsk &= ~HCINT_ACK; channel->hcintmsk &= ~HCINT_ACK;
if (hcsplt.split_en && !hcsplt.split_compl) { if (hcsplt.split_en) {
// start split is ACK --> do complete split if (!hcsplt.split_compl) {
hcsplt.split_compl = 1; // ACK for start split --> do complete split
channel->hcsplt = hcsplt.value; hcsplt.split_compl = 1;
channel->hcsplt = hcsplt.value;
channel->hcchar |= HCCHAR_CHENA;
}
} else {
// ACK interrupt is only enabled for Split and PING
// ACK for PING, which mean device is ready to receive data
channel->hctsiz &= ~HCTSIZ_DOPING; // HC already cleared PING bit, but we clear anyway
channel->hcchar |= HCCHAR_CHENA; channel->hcchar |= HCCHAR_CHENA;
} }
} }