Skip to content

drivers: usb: udc: fix for control buffer rework #106339

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

Merged
MaureenHelm merged 4 commits into from
Mar 30, 2026
Merged

drivers: usb: udc: fix for control buffer rework #106339

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1648ad
drivers: usb: udc: numaker: refine format
ccli8 Mar 20, 2026
7639678
drivers: usb: udc: numaker: hsusbd: fix STALL causes crash
ccli8 Mar 20, 2026
e440c11
drivers: usb: udc: numaker: hsusbd: fix NULL transfer buffer
ccli8 Mar 23, 2026
b87ee76
drivers: usb: udc: numaker: remove Control OUT error check
ccli8 Mar 19, 2026
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
32 changes: 13 additions & 19 deletions drivers/usb/udc/udc_numaker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,8 +919,6 @@ static void numaker_hsusbd_cep_th(const struct device *dev, uint32_t cepintsts)
/* Block until next CEP trigger */
base->CEPINTEN &= ~HSUSBD_CEPINTEN_RXPKIEN_Msk;

base->CEPINTSTS = HSUSBD_CEPINTSTS_RXPKIF_Msk;

/* Message for bottom-half processing */
msg.type = NUMAKER_USBD_MSG_TYPE_OUT;
msg.out.ep = USB_CONTROL_EP_OUT;
Expand All @@ -929,8 +927,6 @@ static void numaker_hsusbd_cep_th(const struct device *dev, uint32_t cepintsts)

/* Data packet transmitted */
if (cepintsts & HSUSBD_CEPINTSTS_TXPKIF_Msk) {
base->CEPINTSTS = HSUSBD_CEPINTSTS_TXPKIF_Msk;

/* Message for bottom-half processing */
msg.type = NUMAKER_USBD_MSG_TYPE_IN;
msg.in.ep = USB_CONTROL_EP_IN;
Expand All @@ -941,8 +937,6 @@ static void numaker_hsusbd_cep_th(const struct device *dev, uint32_t cepintsts)
if (cepintsts & HSUSBD_CEPINTSTS_STSDONEIF_Msk) {
struct udc_numaker_data *priv = udc_get_private(dev);

base->CEPINTSTS = HSUSBD_CEPINTSTS_STSDONEIF_Msk;

/* Message for bottom-half processing */
msg.type = NUMAKER_USBD_MSG_TYPE_STATUS;
if (priv->status_out) {
Expand All @@ -962,9 +956,6 @@ static void numaker_hsusbd_cep_th(const struct device *dev, uint32_t cepintsts)
/* Disable RXPKIEN until Data OUT is enqueued */
base->CEPINTEN &= ~HSUSBD_CEPINTEN_RXPKIEN_Msk;

/* HSUSBD will not set RXPKIF before SETUPPKIF */
base->CEPINTSTS = HSUSBD_CEPINTSTS_SETUPPKIF_Msk;

/* By USB spec, following transactions, regardless of Data/Status stage,
* will always be DATA1. HSUSBD will handle the toggle by itself and needn't
* extra control.
Expand Down Expand Up @@ -2122,13 +2113,6 @@ static int numaker_usbd_msg_handle_out(const struct device *dev, struct numaker_
priv->ctrlout_tailroom -= data_len;
}

if (data_rmn) {
Copy link
Copy Markdown
Contributor

@tmon-nordic tmon-nordic Mar 26, 2026

Choose a reason for hiding this comment

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

DataOut in the second Control transfer has arrived but user buffer for OUT may be only ready for StatusOut in the first Control transfer

What I found problematic is that the hardware automatically receives first Data Out transfer. The workaround for this in software is to mask HSUSBD_CEPINTEN_RXPKIEN_Msk so even that data packet was received, it won't be processed until data buffer is enqueued. Is it possible for the HW to not automatically accept first Data Out packet?

Copy link
Copy Markdown
Contributor Author

@ccli8 ccli8 Mar 26, 2026

Choose a reason for hiding this comment

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

Yes, the HSUSBD hardware will automatically receive the first Data Out transfer. However, the hardware doesn't open related control to disable it.

LOG_ERR("Buffer (%p) queued for ep=0x%02x cannot accommodate packet", buf, ep);
LOG_ERR("net_buf_tailroom(buf)=%d, data_len=%d, data_rmn=%d", net_buf_tailroom(buf),
data_len, data_rmn);
return -ENOBUFS;
}

/* CTRL DATA OUT/STATUS OUT stage completed */
if (ep == USB_CONTROL_EP_OUT) {
if (priv->ctrlout_tailroom != 0) {
Expand All @@ -2147,7 +2131,7 @@ static int numaker_usbd_msg_handle_out(const struct device *dev, struct numaker_
}

if ((net_buf_tailroom(buf) == 0) || (data_len < ep_cfg->mps) ||
(ep_type == USB_EP_TYPE_ISO)) {
(ep_type == USB_EP_TYPE_ISO)) {
/* Fix submit condition for non-control transfer
*
* Do submit when any of the following conditions is met:
Expand Down Expand Up @@ -2272,8 +2256,15 @@ static int numaker_usbd_msg_handle_xfer(const struct device *dev, struct numaker

if (config->is_hsusbd) {
struct udc_ep_config *ep_cfg = udc_get_ep_cfg(dev, ep);
struct net_buf *buf = udc_buf_peek(ep_cfg);
struct udc_buf_info *bi = udc_get_buf_info(buf);
struct net_buf *buf;
struct udc_buf_info *bi;

buf = udc_buf_peek(ep_cfg);
if (buf == NULL) {
return 0;
}

bi = udc_get_buf_info(buf);

if (bi->setup) {
return 0;
Expand Down Expand Up @@ -2545,6 +2536,9 @@ __maybe_unused static void numaker_hsusbd_isr(const struct device *dev)

cepintsts &= base->CEPINTEN;

/* Clear event flag */
base->CEPINTSTS = cepintsts;

numaker_hsusbd_cep_th(dev, cepintsts);
}

Expand Down
Loading