Commit eb3858b6 authored by Prashanth K's avatar Prashanth K Committed by ZhangPeng
Browse files

usb: dwc3: Wait unconditionally after issuing EndXfer command 

stable inclusion
from stable-v6.6.32
commit ec96bcf5f96a7a5c556b0e881ac3e5c3924d542c
bugzilla: https://gitee.com/openeuler/kernel/issues/IA4MGD

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ec96bcf5f96a7a5c556b0e881ac3e5c3924d542c



--------------------------------

commit 1d26ba0944d398f88aaf997bda3544646cf21945 upstream.

Currently all controller IP/revisions except DWC3_usb3 >= 310a
wait 1ms unconditionally for ENDXFER completion when IOC is not
set. This is because DWC_usb3 controller revisions >= 3.10a
supports GUCTL2[14: Rst_actbitlater] bit which allows polling
CMDACT bit to know whether ENDXFER command is completed.

Consider a case where an IN request was queued, and parallelly
soft_disconnect was called (due to ffs_epfile_release). This
eventually calls stop_active_transfer with IOC cleared, hence
send_gadget_ep_cmd() skips waiting for CMDACT cleared during
EndXfer. For DWC3 controllers with revisions >= 310a, we don't
forcefully wait for 1ms either, and we proceed by unmapping the
requests. If ENDXFER didn't complete by this time, it leads to
SMMU faults since the controller would still be accessing those
requests.

Fix this by ensuring ENDXFER completion by adding 1ms delay in
__dwc3_stop_active_transfer() unconditionally.

Cc: stable@vger.kernel.org
Fixes: b353eb6d ("usb: dwc3: gadget: Skip waiting for CMDACT cleared during endxfer")
Signed-off-by: default avatarPrashanth K <quic_prashk@quicinc.com>
Acked-by: default avatarThinh Nguyen <Thinh.Nguyen@synopsys.com>
Link: https://lore.kernel.org/r/20240502044103.1066350-1-quic_prashk@quicinc.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent 00918849

drivers/usb/dwc3/gadget.c

+1 −3
Original line number Diff line number Diff line
@@ -1718,7 +1718,6 @@ static int __dwc3_gadget_get_frame(struct dwc3 *dwc) 
 */

static int __dwc3_stop_active_transfer(struct dwc3_ep *dep, bool force, bool interrupt)

{

	struct dwc3 *dwc = dep->dwc;

	struct dwc3_gadget_ep_cmd_params params;

	u32 cmd;

	int ret;
@@ -1743,7 +1742,6 @@ static int __dwc3_stop_active_transfer(struct dwc3_ep *dep, bool force, bool int 
	dep->resource_index = 0;



	if (!interrupt) {

		if (!DWC3_IP_IS(DWC3) || DWC3_VER_IS_PRIOR(DWC3, 310A))

		mdelay(1);

		dep->flags &= ~DWC3_EP_TRANSFER_STARTED;

	} else if (!ret) {