usb: pch_udc: Fix setup transfers with data out

This patch fixes an issue where the driver does not handle out data in
setup transactions.

The per endpoint cached status register is cleared in the
pch_udc_svc_control_out function. When there is out data available the
function pch_udc_svc_data_out is called which tries to pick it up the
status, which now is cleared to 0. When the status is 0, the function
doesn't start reading the data from the FIFO.

There is a second bug in all this, pch_udc_svc_data_out takes the
endpoint number (0 for EP0), while pch_udc_svc_control_out passes the
endpoint index (1 for EP0). Effectively pch_udc_svc_data_out picks up
the wrong internal ep structure.

This patch makes sure to put back the cached status and pass the
endpoint number rather than index when calling pch_udc_svc_data_out.

Signed-off-by: Richard Röjfors <richard.rojfors@pelagicore.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/pch_udc.c
index 216f648bae6c50728532c6c59a8873dfcd0fc7fe..0c8dd81dddcab5d10b38b9ce967d6e5d9e6cfab4 100644 (file)
--- a/drivers/usb/gadget/pch_udc.c
+++ b/drivers/usb/gadget/pch_udc.c
@@ -2150,7 +2150,10 @@ static void pch_udc_svc_control_out(struct pch_udc_dev *dev)
                        pch_udc_set_dma(dev, DMA_DIR_RX);
                } else {
                        /* control write */
-                       pch_udc_svc_data_out(dev, UDC_EP0OUT_IDX);
+                       /* next function will pickuo an clear the status */
+                       ep->epsts = stat;
+
+                       pch_udc_svc_data_out(dev, 0);
                        /* re-program desc. pointer for possible ZLPs */
                        pch_udc_ep_set_ddptr(ep, ep->td_data_phys);
                        pch_udc_set_dma(dev, DMA_DIR_RX);