Skip to content

!usbd:dwc_otg:OUT prematured urb RXC leads to loose next URB #56

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

!usbd:dwc_otg:OUT prematured urb RXC leads to loose next URB #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c676ac
!usbd:dwc_otg:OUT prematured urb RXC - prematured URB are followed by…
alexrayne Mar 14, 2017
aa14dd8
!usbd:dwc_otg:OUT prematured URB - now not reset TSIZ, but use TSIZ s…
alexrayne Mar 28, 2017
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
25 changes: 25 additions & 0 deletions lib/usbd/backend/dwc_otg_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,19 @@ struct dwc_otg_private_data {

/* FIXME: used for all endpoint setup_data. */
struct usb_setup_data setup_data;

/* Premature terminated OUT URBs are probably have followed by
* COMP_OUT cause IRQ RXC - that should be ommited,
* else next URB will terminate by this loosed RXC */
uint32_t ep_prematured;
};

#define USBD_DEVICE_EXTRA \
struct dwc_otg_private_data private_data;



#include "../usbd_private.h"
void dwc_otg_init(usbd_device *dev);

void dwc_otg_set_address(usbd_device *dev, uint8_t addr);
Expand All @@ -112,6 +120,23 @@ typedef struct usbd_urb usbd_urb;
void dwc_otg_urb_submit(usbd_device *dev, usbd_urb *urb);
void dwc_otg_urb_cancel(usbd_device *dev, usbd_urb *urb);

static inline
bool is_ep_prematured(usbd_device *dev, uint8_t ep_addr)
{
return (dev->private_data.ep_prematured & ep_free_mask(ep_addr));
}

static inline
void mark_ep_as_prematured(usbd_device *dev, uint8_t ep_addr, bool yes)
{
uint32_t mask = ep_free_mask(ep_addr);
if (yes) {
dev->private_data.ep_prematured |= mask;
} else {
dev->private_data.ep_prematured &= ~mask;
}
}

END_DECLS

#endif
11 changes: 11 additions & 0 deletions lib/usbd/backend/usbd_dwc_otg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ void dwc_otg_ep_prepare_start(usbd_device *dev)

dev->private_data.fifo_rx_usage_overall = 16; /* by EP0 and constant */
dev->private_data.fifo_rx_usage_packet = fifo_word + 1; /* EP0 */
dev->private_data.ep_prematured = 0;

disable_all_non_ep0(dev);

Expand Down Expand Up @@ -684,6 +685,7 @@ static void premature_urb_complete(usbd_device *dev, usbd_urb *urb,
REBASE(DWC_OTG_DOEPxINT, ep_num) = 0xFFFF ^ DWC_OTG_DOEPINT_STUP;
REBASE(DWC_OTG_DAINTMSK) &= ~DWC_OTG_DAINTMSK_OEPM(ep_num);
}
mark_ep_as_prematured(dev, transfer->ep_addr, true);

usbd_urb_complete(dev, urb, status);
}
Expand Down Expand Up @@ -919,6 +921,15 @@ static void process_out_endpoint_interrupt(usbd_device *dev, uint8_t ep_num)
LOGF_LN("Transfer Complete: endpoint 0x%"PRIx8, ep_addr);
usbd_urb *urb = usbd_find_active_urb(dev, ep_addr);

if (is_ep_prematured(dev, ep_addr)) {
if (urb != NULL){
//* ommit this RXC and restart current URB
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: "//" C++ comments. Please use C style: /* */

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest you add the -ansi -pedantic options to gcc to have it warn on these.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

C style comments less then 5lines - disturbing me, especialy if it goes in a distance of 1-10lines of code

REBASE(DWC_OTG_DOEPxCTL, ep_num) |= DWC_OTG_DOEP0CTL_EPENA
| DWC_OTG_DOEP0CTL_CNAK;
}
mark_ep_as_prematured(dev, ep_addr, false);
}
else
if (!ep_num && urb != NULL && dev->private_data.ep0tsiz_pktcnt) {
/* We are still expecting data! */

Expand Down