Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

stm32: Work around stm32f407 usbotg chip errata 

It appears bogus entries can get placed on the rxqueue - detect and
clear them.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-08-31 15:04:31 -04:00
parent f7f6680bf6
commit c380d4639b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/stm32/usbotg.c
View File

@ -124,15 +124,22 @@ peek_rx_queue(uint32_t ep)
if (!(sts & USB_OTG_GINTSTS_RXFLVL)) if (!(sts & USB_OTG_GINTSTS_RXFLVL))
// No packet ready // No packet ready
return 0; return 0;
uint32_t grx = OTG->GRXSTSR; uint32_t grx = OTG->GRXSTSR, grx_ep = grx & USB_OTG_GRXSTSP_EPNUM_Msk;
uint32_t pktsts = ((grx & USB_OTG_GRXSTSP_PKTSTS_Msk) uint32_t pktsts = ((grx & USB_OTG_GRXSTSP_PKTSTS_Msk)
>> USB_OTG_GRXSTSP_PKTSTS_Pos); >> USB_OTG_GRXSTSP_PKTSTS_Pos);
if (pktsts != 1 && pktsts != 3 && pktsts != 4) { if ((grx_ep == 0 || grx_ep == USB_CDC_EP_BULK_OUT)
&& (pktsts == 2 || pktsts == 6)) {
// A packet is ready // A packet is ready
if ((grx & USB_OTG_GRXSTSP_EPNUM_Msk) != ep) if (grx_ep != ep)
return 0; return 0;
return grx; return grx;
} }
if ((grx_ep != 0 && grx_ep != USB_CDC_EP_BULK_OUT)
|| (pktsts != 1 && pktsts != 3 && pktsts != 4)) {
// Rx queue has bogus value - just pop it
sts = OTG->GRXSTSP;
continue;
}
// Discard informational entries from queue // Discard informational entries from queue
fifo_read_packet(NULL, 0); fifo_read_packet(NULL, 0);
} }