Skip to content

drivers: usb: stm32: Fix USB FS/HS linux compliance tests #94001

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

Closed
nandojve wants to merge 2 commits into from
Closed

drivers: usb: stm32: Fix USB FS/HS linux compliance tests #94001

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
e032829
drivers: usb: stm32: Enable High Speed interface
nandojve Aug 1, 2025
68b57ea
drivers: usb: stm32: Fix data out on control ep
nandojve Aug 1, 2025
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
1 change: 1 addition & 0 deletions drivers/usb/udc/Kconfig.stm32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ config UDC_STM32
select USE_STM32_LL_USB
select USE_STM32_HAL_PCD
select USE_STM32_HAL_PCD_EX
select UDC_DRIVER_HAS_HIGH_SPEED_SUPPORT if DT_HAS_ST_STM32_OTGHS_ENABLED
select PINCTRL
default y
help
Expand Down
77 changes: 68 additions & 9 deletions drivers/usb/udc/udc_stm32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,15 +322,15 @@ static void handle_msg_data_out(struct udc_stm32_data *priv, uint8_t epnum, uint
LOG_DBG("DataOut ep 0x%02x", ep);

epcfg = udc_get_ep_cfg(dev, ep);
udc_ep_set_busy(epcfg, false);

buf = udc_buf_get(epcfg);
if (unlikely(buf == NULL)) {
udc_ep_set_busy(epcfg, false);
LOG_ERR("ep 0x%02x queue is empty", ep);
return;
}

net_buf_add(buf, rx_count);
udc_ep_set_busy(epcfg, false);

if (ep == USB_CONTROL_EP_OUT) {
if (udc_ctrl_stage_is_status_out(dev)) {
Expand All @@ -353,6 +353,40 @@ static void handle_msg_data_out(struct udc_stm32_data *priv, uint8_t epnum, uint
}
}

static void handle_msg_data_ep0_out(struct udc_stm32_data *priv, uint8_t epnum, uint16_t rx_count)
{
const struct device *dev = priv->dev;
struct udc_ep_config *epcfg;
uint8_t ep = epnum | USB_EP_DIR_OUT;
struct net_buf *buf;
uint8_t *data;
uint32_t len;

epcfg = udc_get_ep_cfg(dev, ep);
buf = udc_buf_peek(epcfg);
if (unlikely(buf == NULL)) {
udc_ep_set_busy(epcfg, false);
return;
}

len = net_buf_tailroom(buf);

/* Check if all data was transferred and then go back to normal flow
* otherwise continue receiving data
*/
LOG_DBG("xfer size: %d, free: %d, size: %d", rx_count, len, buf->size);
if (len == rx_count || rx_count < epcfg->mps) {
/* busy will be release in handle_msg_data_out() */
handle_msg_data_out(priv, epnum, rx_count);
return;
}

net_buf_add(buf, rx_count);
data = net_buf_tail(buf);

HAL_PCD_EP_Receive(&priv->pcd, epcfg->addr, data, buf->size);
}

static void handle_msg_data_in(struct udc_stm32_data *priv, uint8_t epnum)
{
const struct device *dev = priv->dev;
Expand All @@ -363,13 +397,14 @@ static void handle_msg_data_in(struct udc_stm32_data *priv, uint8_t epnum)
LOG_DBG("DataIn ep 0x%02x", ep);

epcfg = udc_get_ep_cfg(dev, ep);
udc_ep_set_busy(epcfg, false);

buf = udc_buf_peek(epcfg);
if (unlikely(buf == NULL)) {
udc_ep_set_busy(epcfg, false);
return;
}

udc_ep_set_busy(epcfg, false);

if (ep == USB_CONTROL_EP_IN && buf->len) {
const struct udc_stm32_config *cfg = dev->config;
uint32_t len = MIN(cfg->ep0_mps, buf->len);
Expand Down Expand Up @@ -420,22 +455,38 @@ static void handle_msg_data_in(struct udc_stm32_data *priv, uint8_t epnum)
}
}

static void drop_control_transfers(const struct device *dev)
{
struct net_buf *buf;

buf = udc_buf_get_all(udc_get_ep_cfg(dev, USB_CONTROL_EP_OUT));
if (buf != NULL) {
net_buf_unref(buf);
}

buf = udc_buf_get_all(udc_get_ep_cfg(dev, USB_CONTROL_EP_IN));
if (buf != NULL) {
net_buf_unref(buf);
}
}

static void handle_msg_setup(struct udc_stm32_data *priv)
{
struct usb_setup_packet *setup = (void *)priv->pcd.Setup;
const struct device *dev = priv->dev;
struct net_buf *buf;
int err;

drop_control_transfers(dev);

buf = udc_ctrl_alloc(dev, USB_CONTROL_EP_OUT, sizeof(struct usb_setup_packet));
if (buf == NULL) {
LOG_ERR("Failed to allocate for setup");
return;
}

net_buf_add_mem(buf, setup, sizeof(struct usb_setup_packet));
udc_ep_buf_set_setup(buf);
memcpy(buf->data, setup, 8);
net_buf_add(buf, 8);

udc_ctrl_update_stage(dev, buf);

Expand All @@ -450,13 +501,16 @@ static void handle_msg_setup(struct udc_stm32_data *priv)

if (udc_ctrl_stage_is_data_out(dev)) {
/* Allocate and feed buffer for data OUT stage */
LOG_DBG("s:%p|feed for -out-", (void *)buf);
err = usbd_ctrl_feed_dout(dev, udc_data_stage_length(buf));
if (err == -ENOMEM) {
udc_submit_ep_event(dev, buf, err);
}
} else if (udc_ctrl_stage_is_data_in(dev)) {
LOG_DBG("s:%p|feed for -in-status", (void *)buf);
udc_ctrl_submit_s_in_status(dev);
} else {
LOG_DBG("s:%p|no data", (void *)buf);
udc_ctrl_submit_s_status(dev);
}
}
Expand All @@ -477,7 +531,12 @@ static void udc_stm32_thread_handler(void *arg1, void *arg2, void *arg3)
handle_msg_data_in(priv, msg.ep);
break;
case UDC_STM32_MSG_DATA_OUT:
handle_msg_data_out(priv, msg.ep, msg.rx_count);
/* workaround to xfer data stage on ep0 */
if (msg.ep == USB_CONTROL_EP_OUT) {
handle_msg_data_ep0_out(priv, msg.ep, msg.rx_count);
} else {
handle_msg_data_out(priv, msg.ep, msg.rx_count);
}
break;
}
}
Expand Down Expand Up @@ -1223,7 +1282,7 @@ static int udc_stm32_driver_init0(const struct device *dev)
ep_cfg_out[i].caps.bulk = 1;
ep_cfg_out[i].caps.interrupt = 1;
ep_cfg_out[i].caps.iso = 1;
ep_cfg_out[i].caps.mps = cfg->ep_mps;
ep_cfg_out[i].caps.mps = (cfg->speed_idx == 2) ? 1024 : 1023;
}

ep_cfg_out[i].addr = USB_EP_DIR_OUT | i;
Expand All @@ -1243,7 +1302,7 @@ static int udc_stm32_driver_init0(const struct device *dev)
ep_cfg_in[i].caps.bulk = 1;
ep_cfg_in[i].caps.interrupt = 1;
ep_cfg_in[i].caps.iso = 1;
ep_cfg_in[i].caps.mps = 1023;
ep_cfg_in[i].caps.mps = (cfg->speed_idx == 2) ? 1024 : 1023;
}

ep_cfg_in[i].addr = USB_EP_DIR_IN | i;
Expand Down
Loading