drivers: udc: do not use the MPS value directly for the endpoint size

Instead, use the helper to get the size field from the MPS value.
MPS value may contain information about additional transaction
per microframe (bits 12..11).

Signed-off-by: Johann Fischer <[email protected]>

Author: jfischer-no

drivers/usb/udc/udc_dwc2.c

@@ -314,14 +314,14 @@ static int dwc2_tx_fifo_write(const struct device *dev,
 		len = buf->len;
 	} else {
 		uint32_t spcavail = dwc2_ftx_avail(dev, ep_idx);
-		uint32_t spcperpkt = ROUND_UP(USB_MPS_EP_SIZE(cfg->mps), 4);
+		uint32_t spcperpkt = ROUND_UP(udc_mps_ep_size(cfg), 4);
 		uint32_t max_pkts, max_transfer;
 
 		/* Maximum number of packets that can fit in TxFIFO */
 		max_pkts = spcavail / spcperpkt;
 
 		/* We can transfer up to max_pkts MPS packets and a short one */
-		max_transfer = (max_pkts * USB_MPS_EP_SIZE(cfg->mps)) +
+		max_transfer = (max_pkts * udc_mps_ep_size(cfg)) +
 			       (spcavail % spcperpkt);
 
 		/* If there is enough space for the transfer, there's no need
@@ -355,10 +355,10 @@ static int dwc2_tx_fifo_write(const struct device *dev,
 		 * Determine the number of packets for the current transfer;
 		 * if the pktcnt is too large, truncate the actual transfer length.
 		 */
-		pktcnt = DIV_ROUND_UP(len, USB_MPS_EP_SIZE(cfg->mps));
+		pktcnt = DIV_ROUND_UP(len, udc_mps_ep_size(cfg));
 		if (pktcnt > max_pktcnt) {
 			pktcnt = ROUND_DOWN(max_pktcnt, (1 + addnl));
-			len = pktcnt * USB_MPS_EP_SIZE(cfg->mps);
+			len = pktcnt * udc_mps_ep_size(cfg);
 		}
 	} else {
 		/* ZLP */
@@ -401,7 +401,7 @@ static int dwc2_tx_fifo_write(const struct device *dev,
 		const uint8_t *src = buf->data;
 
 		while (pktcnt > 0) {
-			uint32_t pktlen = MIN(len, USB_MPS_EP_SIZE(cfg->mps));
+			uint32_t pktlen = MIN(len, udc_mps_ep_size(cfg));
 
 			for (uint32_t i = 0UL; i < pktlen; i += d) {
 				uint32_t val = src[i];
@@ -504,7 +504,7 @@ static void dwc2_prep_rx(const struct device *dev, struct net_buf *buf,
 
 	xfersize = dwc2_rx_xfer_size(priv, cfg, buf);
 
-	pktcnt = DIV_ROUND_UP(xfersize, USB_MPS_EP_SIZE(cfg->mps));
+	pktcnt = DIV_ROUND_UP(xfersize, udc_mps_ep_size(cfg));
 	doeptsiz = usb_dwc2_set_deptsizn_pktcnt(pktcnt) |
 		   usb_dwc2_set_deptsizn_xfersize(xfersize);
 	if (cfg->addr == USB_CONTROL_EP_OUT) {
@@ -887,8 +887,7 @@ static inline void dwc2_handle_rxflvl(const struct device *dev)
 			break;
 		}
 
-		if (((evt.bcnt % USB_MPS_EP_SIZE(ep_cfg->mps)) == 0) &&
-		    net_buf_tailroom(buf)) {
+		if ((evt.bcnt % udc_mps_ep_size(ep_cfg)) == 0 && net_buf_tailroom(buf)) {
 			uint32_t doeptsiz;
 
 			/* Prepare next read only when transfer finished */
@@ -1010,8 +1009,7 @@ static inline void dwc2_handle_out_xfercompl(const struct device *dev,
 
 	net_buf_add(buf, evt.bcnt);
 
-	if (((evt.bcnt % USB_MPS_EP_SIZE(ep_cfg->mps)) == 0) &&
-	    net_buf_tailroom(buf)) {
+	if ((evt.bcnt % udc_mps_ep_size(ep_cfg)) == 0 && net_buf_tailroom(buf)) {
 		dwc2_prep_rx(dev, buf, ep_cfg, 0);
 	} else {
 		k_msgq_put(&drv_msgq, &evt, K_NO_WAIT);
@@ -1200,7 +1198,7 @@ static int dwc2_set_dedicated_fifo(const struct device *dev,
 	/* Keep everything but FIFO number */
 	tmp = *diepctl & ~USB_DWC2_DEPCTL_TXFNUM_MASK;
 
-	reqdep = DIV_ROUND_UP(USB_MPS_EP_SIZE(cfg->mps), 4U);
+	reqdep = DIV_ROUND_UP(udc_mps_ep_size(cfg), 4U);
 	if (priv->bufferdma) {
 		/* In DMA mode, TxFIFO capable of holding 2 packets is enough */
 		reqdep *= MIN(2, (1 + addnl));
@@ -1331,7 +1329,7 @@ static int udc_dwc2_ep_activate(const struct device *dev,
 		dxepctl_reg = (mem_addr_t)&base->in_ep[ep_idx].diepctl;
 	}
 
-	if (priv->bufferdma && (USB_MPS_EP_SIZE(cfg->mps) % 4)) {
+	if (priv->bufferdma && (udc_mps_ep_size(cfg) % 4)) {
 		/* TODO: In Buffer DMA mode, DMA will insert padding bytes in
 		 * between packets if endpoint Max Packet Size is not multiple
 		 * of 4 (DWORD) and single transfer spans across multiple
@@ -1351,7 +1349,7 @@ static int udc_dwc2_ep_activate(const struct device *dev,
 	dxepctl = sys_read32(dxepctl_reg);
 	/* Set max packet size */
 	dxepctl &= ~USB_DWC2_DEPCTL_MPS_MASK;
-	dxepctl |= usb_dwc2_set_depctl_mps(USB_MPS_EP_SIZE(cfg->mps));
+	dxepctl |= usb_dwc2_set_depctl_mps(udc_mps_ep_size(cfg));
 
 	/* Set endpoint type */
 	dxepctl &= ~USB_DWC2_DEPCTL_EPTYPE_MASK;
@@ -1375,7 +1373,7 @@ static int udc_dwc2_ep_activate(const struct device *dev,
 		return -EINVAL;
 	}
 
-	if (USB_EP_DIR_IS_IN(cfg->addr) && USB_MPS_EP_SIZE(cfg->mps) != 0U) {
+	if (USB_EP_DIR_IS_IN(cfg->addr) && udc_mps_ep_size(cfg) != 0U) {
 		int ret = dwc2_set_dedicated_fifo(dev, cfg, &dxepctl);
 
 		if (ret) {
@@ -1578,7 +1576,7 @@ static int udc_dwc2_ep_deactivate(const struct device *dev,
 			cfg->addr, ep_idx, dxepctl);
 	}
 
-	if (USB_EP_DIR_IS_IN(cfg->addr) && USB_MPS_EP_SIZE(cfg->mps) != 0U &&
+	if (USB_EP_DIR_IS_IN(cfg->addr) && udc_mps_ep_size(cfg) != 0U &&
 	    ep_idx != 0U) {
 		dwc2_unset_dedicated_fifo(dev, cfg, &dxepctl);
 	}

drivers/usb/udc/udc_it82xx2.c

@@ -705,7 +705,7 @@ static int it82xx2_xfer_in_data(const struct device *dev, uint8_t ep, struct net
 		it82xx2_usb_fifo_ctrl(dev, ep);
 	}
 
-	len = MIN(buf->len, ep_cfg->mps);
+	len = MIN(buf->len, udc_mps_ep_size(ep_cfg));
 
 	for (size_t i = 0; i < len; i++) {
 		ff_regs[fifo_idx].ep_tx_fifo_data = buf->data[i];
@@ -874,7 +874,7 @@ static inline int work_handler_in(const struct device *dev, uint8_t ep)
 	}
 	ep_cfg = udc_get_ep_cfg(dev, ep);
 
-	net_buf_pull(buf, MIN(buf->len, ep_cfg->mps));
+	net_buf_pull(buf, MIN(buf->len, udc_mps_ep_size(ep_cfg)));
 
 	it82xx2_usb_set_ep_ctrl(dev, ep, EP_DATA_SEQ_TOGGLE, true);
 
@@ -1016,7 +1016,7 @@ static inline int work_handler_out(const struct device *dev, uint8_t ep)
 	}
 
 	ep_cfg = udc_get_ep_cfg(dev, ep);
-	if (len > ep_cfg->mps) {
+	if (len > udc_mps_ep_size(ep_cfg)) {
 		LOG_ERR("Failed to handle this packet due to the packet size");
 		return -ENOBUFS;
 	}

drivers/usb/udc/udc_kinetis.c

@@ -195,10 +195,10 @@ static int usbfsotg_xfer_continue(const struct device *dev,
 	}
 
 	if (USB_EP_DIR_IS_OUT(cfg->addr)) {
-		len = MIN(net_buf_tailroom(buf), cfg->mps);
+		len = MIN(net_buf_tailroom(buf), udc_mps_ep_size(cfg));
 		data_ptr = net_buf_tail(buf);
 	} else {
-		len = MIN(buf->len, cfg->mps);
+		len = MIN(buf->len, udc_mps_ep_size(cfg));
 		data_ptr = buf->data;
 	}
 
@@ -243,7 +243,7 @@ static inline int usbfsotg_ctrl_feed_start(const struct device *dev,
 	}
 
 	bd = usbfsotg_get_ebd(dev, cfg, false);
-	length = MIN(net_buf_tailroom(buf), cfg->mps);
+	length = MIN(net_buf_tailroom(buf), udc_mps_ep_size(cfg));
 
 	priv->out_buf[cfg->stat.odd] = buf;
 	priv->busy[cfg->stat.odd] = true;
@@ -267,7 +267,7 @@ static inline int usbfsotg_ctrl_feed_start_next(const struct device *dev,
 	}
 
 	bd = usbfsotg_get_ebd(dev, cfg, true);
-	length = MIN(net_buf_tailroom(buf), cfg->mps);
+	length = MIN(net_buf_tailroom(buf), udc_mps_ep_size(cfg));
 
 	priv->out_buf[!cfg->stat.odd] = buf;
 	priv->busy[!cfg->stat.odd] = true;
@@ -594,7 +594,8 @@ static ALWAYS_INLINE void isr_handle_xfer_done(const struct device *dev,
 		}
 
 		net_buf_add(buf, len);
-		if (net_buf_tailroom(buf) >= ep_cfg->mps && len == ep_cfg->mps) {
+		if (net_buf_tailroom(buf) >= udc_mps_ep_size(ep_cfg) &&
+		    len == udc_mps_ep_size(ep_cfg)) {
 			if (ep == USB_CONTROL_EP_OUT) {
 				usbfsotg_ctrl_feed_start(dev, buf);
 			} else {

drivers/usb/udc/udc_mcux_ehci.c

@@ -571,7 +571,7 @@ static int udc_mcux_ep_enable(const struct device *dev,
 	ep_init.zlt             = 0U;
 	ep_init.interval        = cfg->interval;
 	ep_init.endpointAddress = cfg->addr;
-	ep_init.maxPacketSize   = cfg->mps;
+	ep_init.maxPacketSize   = udc_mps_ep_size(cfg);
 
 	switch (cfg->attributes & USB_EP_TRANSFER_TYPE_MASK) {
 	case USB_EP_TYPE_CONTROL:

drivers/usb/udc/udc_mcux_ip3511.c

@@ -571,7 +571,7 @@ static int udc_mcux_ep_enable(const struct device *dev,
 	ep_init.zlt             = 0U;
 	ep_init.interval        = cfg->interval;
 	ep_init.endpointAddress = cfg->addr;
-	ep_init.maxPacketSize   = cfg->mps;
+	ep_init.maxPacketSize   = udc_mps_ep_size(cfg);
 
 	switch (cfg->attributes & USB_EP_TRANSFER_TYPE_MASK) {
 	case USB_EP_TYPE_CONTROL:

drivers/usb/udc/udc_nrf.c

@@ -553,7 +553,7 @@ static int udc_nrf_ep_enable(const struct device *dev,
 	uint16_t mps;
 
 	__ASSERT_NO_MSG(cfg);
-	mps = (cfg->mps == 0) ? cfg->caps.mps : cfg->mps;
+	mps = (udc_mps_ep_size(cfg) == 0) ? cfg->caps.mps : udc_mps_ep_size(cfg);
 	nrf_usbd_common_ep_max_packet_size_set(cfg->addr, mps);
 	nrf_usbd_common_ep_enable(cfg->addr);
 	if (!NRF_USBD_EPISO_CHECK(cfg->addr)) {

drivers/usb/udc/udc_stm32.c

@@ -423,7 +423,7 @@ static int udc_stm32_ep_mem_config(const struct device *dev,
 	const struct udc_stm32_config *cfg = dev->config;
 	uint32_t size;
 
-	size = MIN(ep->mps, cfg->ep_mps);
+	size = MIN(udc_mps_ep_size(ep), cfg->ep_mps);
 
 	if (!enable) {
 		priv->occupied_mem -= size;
@@ -487,7 +487,7 @@ static int udc_stm32_ep_mem_config(const struct device *dev,
 		return 0;
 	}
 
-	words = MIN(ep->mps, cfg->ep_mps) / 4;
+	words = MIN(udc_mps_ep_size(ep), cfg->ep_mps) / 4;
 	words = (words <= 64) ? words * 2 : words;
 
 	if (!enable) {
@@ -667,8 +667,8 @@ static int udc_stm32_ep_enable(const struct device *dev,
 		return ret;
 	}
 
-	status = HAL_PCD_EP_Open(&priv->pcd, ep_cfg->addr, ep_cfg->mps,
-				 ep_type);
+	status = HAL_PCD_EP_Open(&priv->pcd, ep_cfg->addr,
+				 udc_mps_ep_size(ep_cfg), ep_type);
 	if (status != HAL_OK) {
 		LOG_ERR("HAL_PCD_EP_Open failed(0x%02x), %d",
 			ep_cfg->addr, (int)status);

drivers/usb/udc/udc_virtual.c

@@ -183,7 +183,7 @@ static int vrt_handle_out(const struct device *dev,
 
 	LOG_DBG("Handle data OUT, %zu | %zu", pkt->length, net_buf_tailroom(buf));
 
-	if (net_buf_tailroom(buf) == 0 || pkt->length < ep_cfg->mps) {
+	if (net_buf_tailroom(buf) == 0 || pkt->length < udc_mps_ep_size(ep_cfg)) {
 		buf = udc_buf_get(dev, ep);
 
 		if (ep == USB_CONTROL_EP_OUT) {
@@ -246,13 +246,13 @@ static int vrt_handle_in(const struct device *dev,
 	}
 
 	LOG_DBG("Handle data IN, %zu | %u | %u",
-		pkt->length, buf->len, ep_cfg->mps);
+		pkt->length, buf->len, udc_mps_ep_size(ep_cfg));
 	min_len = MIN(pkt->length, buf->len);
 	memcpy(pkt->data, buf->data, min_len);
 	net_buf_pull(buf, min_len);
 	pkt->length = min_len;
 
-	if (buf->len == 0 || pkt->length < ep_cfg->mps) {
+	if (buf->len == 0 || pkt->length < udc_mps_ep_size(ep_cfg)) {
 		if (udc_ep_buf_has_zlp(buf)) {
 			udc_ep_buf_clear_zlp(buf);
 			goto continue_in;

include/zephyr/drivers/usb/udc.h

@@ -726,6 +726,18 @@ static inline const void *udc_get_event_ctx(const struct device *dev)
 	return data->event_ctx;
 }
 
+/**
+ * @brief Get endpoint size from UDC endpoint configuration
+ *
+ * @param[in] cfg Pointer to UDC endpoint configuration
+ *
+ * @return Endpoint size
+ */
+static inline uint16_t udc_mps_ep_size(const struct udc_ep_config *const cfg)
+{
+	return USB_MPS_EP_SIZE(cfg->mps);
+}
+
 /**
  * @}
  */