This is a note to let you know that I've just added the patch titled
usb: mtu3: fix the wrong HS mult value
to the 5.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-mtu3-fix-the-wrong-hs-mult-value.patch
and it can be found in the queue-5.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 44e4439d8f9f8d0e9da767d1f31e7c211081feca Mon Sep 17 00:00:00 2001
From: Chunfeng Yun <chunfeng.yun@xxxxxxxxxxxx>
Date: Fri, 13 Aug 2021 14:30:49 +0800
Subject: usb: mtu3: fix the wrong HS mult value
From: Chunfeng Yun <chunfeng.yun@xxxxxxxxxxxx>
commit 44e4439d8f9f8d0e9da767d1f31e7c211081feca upstream.
usb_endpoint_maxp() returns actual max packet size, @mult will
always be zero, fix it by using usb_endpoint_maxp_mult() instead
to get mult.
Fixes: 4d79e042ed8b ("usb: mtu3: add support for usb3.1 IP")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Chunfeng Yun <chunfeng.yun@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/1628836253-7432-3-git-send-email-chunfeng.yun@xxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/usb/mtu3/mtu3_gadget.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/drivers/usb/mtu3/mtu3_gadget.c
+++ b/drivers/usb/mtu3/mtu3_gadget.c
@@ -64,14 +64,12 @@ static int mtu3_ep_enable(struct mtu3_ep
u32 interval = 0;
u32 mult = 0;
u32 burst = 0;
- int max_packet;
int ret;
desc = mep->desc;
comp_desc = mep->comp_desc;
mep->type = usb_endpoint_type(desc);
- max_packet = usb_endpoint_maxp(desc);
- mep->maxp = max_packet & GENMASK(10, 0);
+ mep->maxp = usb_endpoint_maxp(desc);
switch (mtu->g.speed) {
case USB_SPEED_SUPER:
@@ -92,7 +90,7 @@ static int mtu3_ep_enable(struct mtu3_ep
usb_endpoint_xfer_int(desc)) {
interval = desc->bInterval;
interval = clamp_val(interval, 1, 16) - 1;
- mult = (max_packet & GENMASK(12, 11)) >> 11;
+ mult = usb_endpoint_maxp_mult(desc) - 1;
}
break;
default:
Patches currently in stable-queue which might be from chunfeng.yun@xxxxxxxxxxxx are
queue-5.14/usb-mtu3-fix-the-wrong-hs-mult-value.patch
queue-5.14/usb-cdnsp-fix-the-wrong-mult-value-for-hs-isoc-or-intr.patch
queue-5.14/usb-xhci-mtk-fix-issue-of-out-of-bounds-array-access.patch
queue-5.14/usb-gadget-tegra-xudc-fix-the-wrong-mult-value-for-hs-isoc-or-intr.patch
queue-5.14/usb-mtu3-use-mult-for-hs-isoc-or-intr.patch
queue-5.14/usb-mtu3-restore-hs-function-when-set-ss-ssp.patch
