OrgZephyr/zephyr
OrgZephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

drivers: udc_nrf: fix enqueue of control IN transfer with length 0 

If the direction of the last setup packet is not to the device but to
the host, then the transfer is not a status stage and should be queued.
This is not checked and prevents a zero length control IN transfer to
the host, e.g. used by the DFU class to indicate the end of the upload
process.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
This commit is contained in:
Johann Fischer 2024-10-23 11:23:23 +02:00 committed by Mahesh Mahadevan
parent 0c299e66a4
commit 973f914b90
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/usb/udc/udc_nrf.c
View File

@ -487,7 +487,7 @@ static void udc_nrf_power_handler(nrfx_power_usb_evt_t pwr_evt)
}
}
static void udc_nrf_fake_status_in(const struct device *dev)
static bool udc_nrf_fake_status_in(const struct device *dev)
{
struct udc_nrf_evt evt = {
.type = UDC_NRF_EVT_STATUS_IN,
@ -497,7 +497,10 @@ static void udc_nrf_fake_status_in(const struct device *dev)
if (nrf_usbd_common_last_setup_dir_get() == USB_CONTROL_EP_OUT) {
/* Let controller perform status IN stage */
k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
return true;
}
return false;
}
static int udc_nrf_ep_enqueue(const struct device *dev,
@ -512,8 +515,9 @@ static int udc_nrf_ep_enqueue(const struct device *dev,
udc_buf_put(cfg, buf);
if (cfg->addr == USB_CONTROL_EP_IN && buf->len == 0) {
udc_nrf_fake_status_in(dev);
return 0;
if (udc_nrf_fake_status_in(dev)) {
return 0;
}
}
k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);