Skip to content

Commit f4ecdc3

Browse files
pawellcdnsgregkh
authored andcommitted
usb: cdnsp: Fix issue with detecting command completion event
In some cases, there is a small-time gap in which CMD_RING_BUSY can be cleared by controller but adding command completion event to event ring will be delayed. As the result driver will return error code. This behavior has been detected on usbtest driver (test 9) with configuration including ep1in/ep1out bulk and ep2in/ep2out isoc endpoint. Probably this gap occurred because controller was busy with adding some other events to event ring. The CMD_RING_BUSY is cleared to '0' when the Command Descriptor has been executed and not when command completion event has been added to event ring. To fix this issue for this test the small delay is sufficient less than 10us) but to make sure the problem doesn't happen again in the future the patch introduces 10 retries to check with delay about 20us before returning error code. Fixes: 3d82904 ("usb: cdnsp: cdns3 Add main part of Cadence USBSSP DRD Driver") Cc: stable <stable@kernel.org> Signed-off-by: Pawel Laszczak <pawell@cadence.com> Acked-by: Peter Chen <peter.chen@kernel.org> Link: https://lore.kernel.org/r/PH7PR07MB9538AA45362ACCF1B94EE9B7DD96A@PH7PR07MB9538.namprd07.prod.outlook.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2852788 commit f4ecdc3

1 file changed

Lines changed: 17 additions & 1 deletion

File tree

drivers/usb/cdns3/cdnsp-gadget.c

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,7 @@ int cdnsp_wait_for_cmd_compl(struct cdnsp_device *pdev)
548548
dma_addr_t cmd_deq_dma;
549549
union cdnsp_trb *event;
550550
u32 cycle_state;
551+
u32 retry = 10;
551552
int ret, val;
552553
u64 cmd_dma;
553554
u32 flags;
@@ -579,8 +580,23 @@ int cdnsp_wait_for_cmd_compl(struct cdnsp_device *pdev)
579580
flags = le32_to_cpu(event->event_cmd.flags);
580581

581582
/* Check the owner of the TRB. */
582-
if ((flags & TRB_CYCLE) != cycle_state)
583+
if ((flags & TRB_CYCLE) != cycle_state) {
584+
/*
585+
* Give some extra time to get chance controller
586+
* to finish command before returning error code.
587+
* Checking CMD_RING_BUSY is not sufficient because
588+
* this bit is cleared to '0' when the Command
589+
* Descriptor has been executed by controller
590+
* and not when command completion event has
591+
* be added to event ring.
592+
*/
593+
if (retry--) {
594+
udelay(20);
595+
continue;
596+
}
597+
583598
return -EINVAL;
599+
}
584600

585601
cmd_dma = le64_to_cpu(event->event_cmd.cmd_trb);
586602

0 commit comments

Comments
 (0)