usb: chipidea: udc: limit usb request length to max 16KB

[ Upstream commit ca8d18aa7b0f22d66a3ca9a90d8f73431b8eca89 ]

To let the device controller work properly on short packet limitations,
one usb request should only correspond to one dTD. Then every dTD will
set IOC. In theory, each dTD support up to 20KB data transfer if the
offset is 0. Due to we cannot predetermine the offset, this will limit
the usb request length to max 16KB. This should be fine since most of
the user transfer data based on this size policy.

Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
Acked-by: Peter Chen <peter.chen@kernel.org>
Link: https://lore.kernel.org/r/20240923081203.2851768-2-xu.yang_2@nxp.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h
index e4b003d060c260874fbca4d4df2e786214b068ba..97437de52ef681a70cbab1c0f4d94eab5139e7e2 100644 (file)
--- a/drivers/usb/chipidea/ci.h
+++ b/drivers/usb/chipidea/ci.h
@@ -25,6 +25,7 @@
 #define TD_PAGE_COUNT      5
 #define CI_HDRC_PAGE_SIZE  4096ul /* page size for TD's */
 #define ENDPT_MAX          32
+#define CI_MAX_REQ_SIZE        (4 * CI_HDRC_PAGE_SIZE)
 #define CI_MAX_BUF_SIZE        (TD_PAGE_COUNT * CI_HDRC_PAGE_SIZE)
 
 /******************************************************************************

diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 69ef3cd8d4f836ab52e9cbae847f1d461f966619..d3556416dae4fd8baa7693c09e2d378f5e8e823c 100644 (file)
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -960,6 +960,12 @@ static int _ep_queue(struct usb_ep *ep, struct usb_request *req,
                return -EMSGSIZE;
        }
 
+       if (ci->has_short_pkt_limit &&
+               hwreq->req.length > CI_MAX_REQ_SIZE) {
+               dev_err(hwep->ci->dev, "request length too big (max 16KB)\n");
+               return -EMSGSIZE;
+       }
+
        /* first nuke then test link, e.g. previous status has not sent */
        if (!list_empty(&hwreq->queue)) {
                dev_err(hwep->ci->dev, "request already in queue\n");