korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-21 12:11:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

usb: cdnsp: fix for Link TRB with TC

Browse Source 
Stop Endpoint command on LINK TRB with TC bit set to 1 causes that
internal cycle bit can have incorrect state after command complete.
In consequence empty transfer ring can be incorrectly detected
when EP is resumed.
NOP TRB before LINK TRB avoid such scenario. Stop Endpoint command
is then on NOP TRB and internal cycle bit is not changed and have
correct value.

Fixes: 3d82904559 ("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/PH7PR07MB953878279F375CCCE6C6F40FDD8E2@PH7PR07MB9538.namprd07.prod.outlook.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Pawel Laszczak 2024-08-21 06:07:42 +00:00 committed by Greg Kroah-Hartman
parent cd4897bfd1
commit 740f2e2791
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/cdns3/cdnsp-gadget.h
View File

@ -811,6 +811,7 @@ struct cdnsp_stream_info {
* generate Missed Service Error Event.
* Set skip flag when receive a Missed Service Error Event and
* process the missed tds on the endpoint ring.
* @wa1_nop_trb: hold pointer to NOP trb.
*/
struct cdnsp_ep {
struct usb_ep endpoint;
@ -838,6 +839,8 @@ struct cdnsp_ep {
#define EP_UNCONFIGURED BIT(7)
bool skip;
union cdnsp_trb *wa1_nop_trb;
};
/**

28
drivers/usb/cdns3/cdnsp-ring.c
View File

@ -1904,6 +1904,23 @@ int cdnsp_queue_bulk_tx(struct cdnsp_device *pdev, struct cdnsp_request *preq)
if (ret)
return ret;
/*
* workaround 1: STOP EP command on LINK TRB with TC bit set to 1
* causes that internal cycle bit can have incorrect state after
* command complete. In consequence empty transfer ring can be
* incorrectly detected when EP is resumed.
* NOP TRB before LINK TRB avoid such scenario. STOP EP command is
* then on NOP TRB and internal cycle bit is not changed and have
* correct value.
*/
if (pep->wa1_nop_trb) {
field = le32_to_cpu(pep->wa1_nop_trb->trans_event.flags);
field ^= TRB_CYCLE;
pep->wa1_nop_trb->trans_event.flags = cpu_to_le32(field);
pep->wa1_nop_trb = NULL;
}
/*
* Don't give the first TRB to the hardware (by toggling the cycle bit)
* until we've finished creating all the other TRBs. The ring's cycle
@ -1999,6 +2016,17 @@ int cdnsp_queue_bulk_tx(struct cdnsp_device *pdev, struct cdnsp_request *preq)
send_addr = addr;
}
if (cdnsp_trb_is_link(ring->enqueue + 1)) {
field = TRB_TYPE(TRB_TR_NOOP) | TRB_IOC;
if (!ring->cycle_state)
field |= TRB_CYCLE;
pep->wa1_nop_trb = ring->enqueue;
cdnsp_queue_trb(pdev, ring, 0, 0x0, 0x0,
TRB_INTR_TARGET(0), field);
}
cdnsp_check_trb_math(preq, enqd_len);
ret = cdnsp_giveback_first_trb(pdev, pep, preq->request.stream_id,
start_cycle, start_trb);