소스 검색

usb: dwc3: fix implementation of endpoint wedge

The dwc3 UDC driver doesn't implement endpoint wedging correctly.
When an endpoint is wedged, the gadget driver should be allowed to
clear the wedge by calling usb_ep_clear_halt().  Only the host is
prevented from resetting the endpoint.

This patch fixes the implementation.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Tested-by: Pratyush Anand <pratyush.anand@st.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Alan Stern 11 년 전
부모
커밋
a535d81c92
2개의 변경된 파일3개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 0
      drivers/usb/dwc3/ep0.c
  2. 1 4
      drivers/usb/dwc3/gadget.c

+ 2 - 0
drivers/usb/dwc3/ep0.c

@@ -459,6 +459,8 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc,
 			dep = dwc3_wIndex_to_dep(dwc, wIndex);
 			dep = dwc3_wIndex_to_dep(dwc, wIndex);
 			if (!dep)
 			if (!dep)
 				return -EINVAL;
 				return -EINVAL;
+			if (set == 0 && (dep->flags & DWC3_EP_WEDGE))
+				break;
 			ret = __dwc3_gadget_ep_set_halt(dep, set);
 			ret = __dwc3_gadget_ep_set_halt(dep, set);
 			if (ret)
 			if (ret)
 				return -EINVAL;
 				return -EINVAL;

+ 1 - 4
drivers/usb/dwc3/gadget.c

@@ -1200,9 +1200,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value)
 		else
 		else
 			dep->flags |= DWC3_EP_STALL;
 			dep->flags |= DWC3_EP_STALL;
 	} else {
 	} else {
-		if (dep->flags & DWC3_EP_WEDGE)
-			return 0;
-
 		ret = dwc3_send_gadget_ep_cmd(dwc, dep->number,
 		ret = dwc3_send_gadget_ep_cmd(dwc, dep->number,
 			DWC3_DEPCMD_CLEARSTALL, &params);
 			DWC3_DEPCMD_CLEARSTALL, &params);
 		if (ret)
 		if (ret)
@@ -1210,7 +1207,7 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value)
 					value ? "set" : "clear",
 					value ? "set" : "clear",
 					dep->name);
 					dep->name);
 		else
 		else
-			dep->flags &= ~DWC3_EP_STALL;
+			dep->flags &= ~(DWC3_EP_STALL | DWC3_EP_WEDGE);
 	}
 	}
 
 
 	return ret;
 	return ret;