Skip to contentSkip to conversation

Patch "usb: dwc3: gadget: skip Set/Clear Halt when invalid" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message Mar 10, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

usb: dwc3: gadget: skip Set/Clear Halt when invalid

to the 4.10-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-dwc3-gadget-skip-set-clear-halt-when-invalid.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From ffb80fc672c3a7b6afd0cefcb1524fb99917b2f3 Mon Sep 17 00:00:00 2001

From: Felipe Balbi <[email protected]>
Date: Thu, 19 Jan 2017 13:38:42 +0200
Subject: usb: dwc3: gadget: skip Set/Clear Halt when invalid

From: Felipe Balbi <[email protected]>

commit ffb80fc672c3a7b6afd0cefcb1524fb99917b2f3 upstream.

At least macOS seems to be sending ClearFeature(ENDPOINT_HALT) to endpoints which aren't Halted. This makes DWC3's CLEARSTALL command time out which causes several issues for the driver.

Instead, let's just return 0 and bail out early.

---
 drivers/usb/dwc3/gadget.c |    5 +++++
 1 file changed, 5 insertions(+)
drivers/usb/dwc3/gadget.c +5 -0
@@ -1335,6 +1335,9 @@ int __dwc3_gadget_ep_set_halt(struct dwc
 		unsigned transfer_in_flight;
 		unsigned started;
 
+		if (dep->flags & DWC3_EP_STALL)
+			return 0;
+
 		if (dep->number > 1)
 			trb = dwc3_ep_prev_trb(dep, dep->trb_enqueue);
 		else
@@ -1356,6 +1359,8 @@ int __dwc3_gadget_ep_set_halt(struct dwc
 		else
 			dep->flags |= DWC3_EP_STALL;
 	} else {
+		if (!(dep->flags & DWC3_EP_STALL))
+			return 0;
 
 		ret = dwc3_send_clear_stall_ep_cmd(dep);
 		if (ret)

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/usb-gadget-f_hid-fix-move-in-request-allocation-to-set_alt.patch queue-4.10/usb-gadget-udc-fsl-add-missing-complete-function.patch queue-4.10/usb-gadget-f_hid-use-spinlock-instead-of-mutex.patch queue-4.10/usb-gadget-f_hid-fix-free-out-requests.patch queue-4.10/usb-gadget-f_hid-fix-prevent-accessing-released-memory.patch queue-4.10/usb-gadget-udc-core-rescan-pending-list-on-driver-unbind.patch queue-4.10/usb-dwc3-gadget-skip-set-clear-halt-when-invalid.patch