patch "usb: cdnsp: Fixes issue with redundant Status Stage" added to usb-linus
Subsystems (3)
This is a note to let you know that I've just added the patch titled
usb: cdnsp: Fixes issue with redundant Status Stage
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
From 5bc38d33a5a1209fd4de65101d1ae8255ea12c6e Mon Sep 17 00:00:00 2001
From: Pawel Laszczak <[email protected]>
Date: Tue, 7 Mar 2023 06:14:20 -0500
Subject: usb: cdnsp: Fixes issue with redundant Status Stage
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.
--- drivers/usb/cdns3/cdnsp-ep0.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)
drivers/usb/cdns3/cdnsp-ep0.c +1 -18
@@ -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); }
Signature · 1 line
2.40.0