From: Pawel Laszczak <pawell@cadence.com>

Date: Tue, 7 Mar 2023 06:14:20 -0500

Subject: [PATCH] usb: cdnsp: Fixes issue with redundant Status Stage

References: bsc#1012628

Patch-mainline: 6.2.9

Git-commit: 5bc38d33a5a1209fd4de65101d1ae8255ea12c6e

commit 5bc38d33a5a1209fd4de65101d1ae8255ea12c6e upstream.

In some cases, driver trees to send Status Stage twice.

The first one from upper layer of gadget usb subsystem and

second time from controller driver.

This patch fixes this issue and remove tricky handling of

SET_INTERFACE from controller driver which is no longer

needed.

cc: <stable@vger.kernel.org>

Fixes: 3d82904559f4 ("usb: cdnsp: cdns3 Add main part of Cadence USBSSP DRD Driver")

Signed-off-by: Pawel Laszczak <pawell@cadence.com>

Link: https://lore.kernel.org/r/20230307111420.376056-1-pawell@cadence.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 drivers/usb/cdns3/cdnsp-ep0.c | 19 +------------------

 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/drivers/usb/cdns3/cdnsp-ep0.c b/drivers/usb/cdns3/cdnsp-ep0.c

index 9b8325f8..d63d5d92 100644

--- a/drivers/usb/cdns3/cdnsp-ep0.c

+++ b/drivers/usb/cdns3/cdnsp-ep0.c

@@ -403,20 +403,6 @@ static int cdnsp_ep0_std_request(struct cdnsp_device *pdev,

 	case USB_REQ_SET_ISOCH_DELAY:

 		ret = cdnsp_ep0_set_isoch_delay(pdev, ctrl);

 		break;

-	case USB_REQ_SET_INTERFACE:

-		/*

-		 * Add request into pending list to block sending status stage

-		 * by libcomposite.

-		 */

-		list_add_tail(&pdev->ep0_preq.list,

-			      &pdev->ep0_preq.pep->pending_list);

-

-		ret = cdnsp_ep0_delegate_req(pdev, ctrl);

-		if (ret == -EBUSY)

-			ret = 0;

-

-		list_del(&pdev->ep0_preq.list);

-		break;

 	default:

 		ret = cdnsp_ep0_delegate_req(pdev, ctrl);

 		break;

@@ -474,9 +460,6 @@ void cdnsp_setup_analyze(struct cdnsp_device *pdev)

 	else

 		ret = cdnsp_ep0_delegate_req(pdev, ctrl);

-	if (!len)

-		pdev->ep0_stage = CDNSP_STATUS_STAGE;

-

 	if (ret == USB_GADGET_DELAYED_STATUS) {

 		trace_cdnsp_ep0_status_stage("delayed");

 		return;

@@ -484,6 +467,6 @@ void cdnsp_setup_analyze(struct cdnsp_device *pdev)

 out:

 	if (ret < 0)

 		cdnsp_ep0_stall(pdev);

-	else if (pdev->ep0_stage == CDNSP_STATUS_STAGE)

+	else if (!len && pdev->ep0_stage != CDNSP_STATUS_STAGE)

 		cdnsp_status_stage(pdev);

 }

-- 

2.35.3