diff options
| author | Jules Maselbas <jmaselbas@kalray.eu> | 2020-08-11 17:16:32 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-08-14 14:05:17 +0200 |
| commit | 446bcf875395391eb4054b240fad203fbab22285 (patch) | |
| tree | b4c7c07bdfeea41f3b977cacab0ddad19ba3ef28 /drivers | |
| parent | 5f5d734a50f3f2cd18b3ed7a18a43757e2b49e9b (diff) | |
| download | barebox-446bcf875395391eb4054b240fad203fbab22285.tar.gz barebox-446bcf875395391eb4054b240fad203fbab22285.tar.xz | |
usb: dwc2: host: Fix toggle reset
From USB 2.0 specification, section 9.4.5:
ClearFeature(ENDPOINT_HALT) request always results in
the data toggle being reinitialized to DATA0.
The hacky solution for now is to reset the toggle bit to DATA0 when
the host controller send a ClearFeature request on an endpoint.
Signed-off-by: Jules Maselbas <jmaselbas@kalray.eu>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/dwc2/host.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/usb/dwc2/host.c b/drivers/usb/dwc2/host.c index 8726f3dad1..ba1fb555ee 100644 --- a/drivers/usb/dwc2/host.c +++ b/drivers/usb/dwc2/host.c @@ -109,6 +109,14 @@ static void dwc2_hc_init(struct dwc2 *dwc2, uint8_t hc, dwc2_writel(dwc2, 0, HCSPLT(hc)); } +static void dwc2_endpoint_reset(struct dwc2 *dwc2, int in, int devnum, int ep) +{ + if (in) + dwc2->in_data_toggle[devnum][ep] = TSIZ_SC_MC_PID_DATA0; + else + dwc2->out_data_toggle[devnum][ep] = TSIZ_SC_MC_PID_DATA0; +} + static int wait_for_chhltd(struct dwc2 *dwc2, u8 hc, uint32_t *sub, u8 *tgl) { int ret; @@ -373,7 +381,18 @@ static int dwc2_submit_control_msg(struct usb_device *udev, if (ret) return ret; + if (setup->requesttype == USB_RECIP_ENDPOINT + && setup->request == USB_REQ_CLEAR_FEATURE) { + /* From USB 2.0, section 9.4.5: + * ClearFeature(ENDPOINT_HALT) request always results + * in the data toggle being reinitialized to DATA0. + */ + int ep = le16_to_cpu(setup->index) & 0xf; + dwc2_endpoint_reset(dwc2, usb_pipein(pipe), devnum, ep); + } + udev->act_len = act_len; + udev->status = 0; return 0; } |