usb: cdnsp: Fix incorrect usb_request status

commit 1702bec4477cc7d31adb4a760d14d33fac928b7a upstream.

Fix changes incorrect usb_request->status returned during disabling
endpoints. Before fix the status returned during dequeuing requests
while disabling endpoint was ECONNRESET.
Patch change it to ESHUTDOWN.

Patch fixes issue detected during testing UVC gadget.
During stopping streaming the class starts dequeuing usb requests and
controller driver returns the -ECONNRESET status. After completion
requests the class or application "uvc-gadget" try to queue this
request again. Changing this status to ESHUTDOWN cause that UVC assumes
that endpoint is disabled, or device is disconnected and stops
re-queuing usb requests.

Fixes: 3d82904559f4 ("usb: cdnsp: cdns3 Add main part of Cadence USBSSP DRD Driver")
cc: stable@vger.kernel.org
Signed-off-by: Pawel Laszczak <pawell@cadence.com>
Reviewed-by: Peter Chen <peter.chen@kernel.org>
Link: https://lore.kernel.org/r/PH7PR07MB9538E8CA7A2096AAF6A3718FDD9E2@PH7PR07MB9538.namprd07.prod.outlook.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/cdns3/cdnsp-ring.c b/drivers/usb/cdns3/cdnsp-ring.c
index 04e8db773a8257fdb2f16388dc0290e957867866..47096b8e317939e747279c08408505f54241a2ca 100644 (file)
--- a/drivers/usb/cdns3/cdnsp-ring.c
+++ b/drivers/usb/cdns3/cdnsp-ring.c
@@ -718,7 +718,8 @@ int cdnsp_remove_request(struct cdnsp_device *pdev,
        seg = cdnsp_trb_in_td(pdev, cur_td->start_seg, cur_td->first_trb,
                              cur_td->last_trb, hw_deq);
 
-       if (seg && (pep->ep_state & EP_ENABLED))
+       if (seg && (pep->ep_state & EP_ENABLED) &&
+           !(pep->ep_state & EP_DIS_IN_RROGRESS))
                cdnsp_find_new_dequeue_state(pdev, pep, preq->request.stream_id,
                                             cur_td, &deq_state);
        else
@@ -736,7 +737,8 @@ int cdnsp_remove_request(struct cdnsp_device *pdev,
         * During disconnecting all endpoint will be disabled so we don't
         * have to worry about updating dequeue pointer.
         */
-       if (pdev->cdnsp_state & CDNSP_STATE_DISCONNECT_PENDING) {
+       if (pdev->cdnsp_state & CDNSP_STATE_DISCONNECT_PENDING ||
+           pep->ep_state & EP_DIS_IN_RROGRESS) {
                status = -ESHUTDOWN;
                ret = cdnsp_cmd_set_deq(pdev, pep, &deq_state);
        }